diff options
| author | lanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-12-16 14:43:04 +0000 |
|---|---|---|
| committer | lanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-12-16 14:43:04 +0000 |
| commit | b8817bcb3ccd20f6c3cecff1dca3adbc663e1a55 (patch) | |
| tree | 3930a3cc8ace8d21c7e3a0cbe3d5f5edd4a25c3e /lib/sbin | |
| parent | 2629e17375cee5c4dcf3495b7ca4249c7e22b523 (diff) | |
inherits and friend can now be separated by ,:; and whitespaces
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1201 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin')
| -rw-r--r-- | lib/sbin/interface_parser.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl index b9c88138..bd6a6858 100644 --- a/lib/sbin/interface_parser.pl +++ b/lib/sbin/interface_parser.pl @@ -31,7 +31,7 @@ sub create_interface_database # Read the data @indata = &read_file("$thorns{$thorn}/interface.ccl"); - + # Get the interface data from it @new_interface_data = &parse_interface_ccl($arrangement,$thorn, @indata); @@ -612,9 +612,11 @@ sub parse_interface_ccl &CST_error(0,$message,__LINE__,__FILE__); } } - elsif ($line =~ m/^\s*(INHERITS|FRIEND)\s*:((\s*[a-zA-Z]+[a-zA-Z_0-9]*)*\s*)$/i) + # implementation names can be sepeated by ,;:\s, where ,;: are stripped out below + elsif ($line =~ m/^\s*(INHERITS|FRIEND)\s*:(([,;:\s]*[a-zA-Z]+[a-zA-Z_0-9]*)*[,;:\s]*)$/i) { $interface_db{"\U$thorn $1\E"} .= $2; + $interface_db{"\U$thorn $1\E"}=~s/[,;:]/ /g; } elsif ($line =~ m/^\s*(PUBLIC|PROTECTED|PRIVATE)\s*:\s*$/i) { |