summaryrefslogtreecommitdiff
path: root/lib/sbin/interface_parser.pl
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-11-02 16:21:06 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-11-02 16:21:06 +0000
commit22c73283d0622007ea4b424725eafeeec5aa73b8 (patch)
treebe5a805ac3cbbec3fcc8cbec38a1d1652ac82748 /lib/sbin/interface_parser.pl
parent464ff2f4fc98557473ef26c91a0e4fc787e07e16 (diff)
Allow the length of a vector array can to be an arithmetical combination of
parameters. Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@2445 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/interface_parser.pl')
-rw-r--r--lib/sbin/interface_parser.pl13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl
index 10b71f62..aa7a2bda 100644
--- a/lib/sbin/interface_parser.pl
+++ b/lib/sbin/interface_parser.pl
@@ -804,19 +804,19 @@ sub parse_interface_ccl
$interface_db{"\U$thorn PROVIDES FUNCTION\E $funcname LANG"} .= "$provided_by_language";
}
}
- elsif ($line =~ m/^\s*(CCTK_)?(CHAR|BYTE|INT|INT2|INT4|INT8|REAL|REAL4|REAL8|REAL16|COMPLEX|COMPLEX8|COMPLEX16|COMPLEX32)\s*(([a-zA-Z]+[a-zA-Z_0-9]*)(\[([a-zA-Z1-9][a-zA-Z_0-9]*)(::[a-zA-Z]+[a-zA-Z_0-9]*)?\])?)\s*(.*)\s*$/i)
+ elsif ($line =~ m/^\s*(CCTK_)?(CHAR|BYTE|INT|INT2|INT4|INT8|REAL|REAL4|REAL8|REAL16|COMPLEX|COMPLEX8|COMPLEX16|COMPLEX32)\s*(([a-zA-Z]+[a-zA-Z_0-9]*)(\[([^]]+)\])?)\s*(.*)\s*$/i)
{
# for($i = 1; $i < 10; $i++)
# {
-# print "$i is ${$i}\n";
+# print "$i is ${$i}\n";
# }
my $vtype = $2;
my $current_group = "$4";
my $isgrouparray = $5;
my $grouparray_size = $6;
- my $options_list = $8;
+ my $options_list = $7;
if($known_groups{"\U$current_group\E"})
{
@@ -970,11 +970,8 @@ sub parse_interface_ccl
&CST_error(0,$message,"",__LINE__,__FILE__);
}
- # get its size and, if a parameter, get fullname
- if($grouparray_size !~ m/::/)
- {
- $grouparray_size = "$thorn\::$grouparray_size";
- }
+ # get its size
+
$interface_db{"\U$thorn GROUP $current_group\E VARARRAY_SIZE"} = $grouparray_size;
if($data[$line_number+1] =~ m/^\s*\{\s*$/)