diff options
| author | Olly Betts <olly@survex.com> | 2023-05-17 17:21:36 +1200 |
|---|---|---|
| committer | Olly Betts <ojwbetts@gmail.com> | 2023-05-18 07:00:16 +1200 |
| commit | 086cb543f9fd11cf1e146f7b761fcdd80574f4b7 (patch) | |
| tree | 49194b945c1b7ddd92b4edf63e2e69e3968d78c0 /Source | |
| parent | 56f82e554151a92ffcf6b938e5d57ac9d2170c9e (diff) | |
| download | swig-086cb543f9fd11cf1e146f7b761fcdd80574f4b7.tar.gz | |
Simplify grammar rules for alternative start symbols
We have some rules to allow parsing just a type, parameter or parameter
list. Instead of using a semicolon as an end marker for these, just use
the special END token which always marks the end of input.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CParse/parser.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 7a9cefe7b..5e09e54e7 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1785,23 +1785,23 @@ program : interface { Setattr($1,"module",module_node); top = $1; } - | PARSETYPE parm SEMI { + | PARSETYPE parm END { top = Copy(Getattr($2,"type")); Delete($2); } | PARSETYPE error { top = 0; } - | PARSEPARM parm SEMI { + | PARSEPARM parm END { top = $2; } | PARSEPARM error { top = 0; } - | PARSEPARMS LPAREN parms RPAREN SEMI { + | PARSEPARMS LPAREN parms RPAREN END { top = $3; } - | PARSEPARMS error SEMI { + | PARSEPARMS error { top = 0; } ; @@ -7451,7 +7451,7 @@ empty : ; SwigType *Swig_cparse_type(String *s) { String *ns; - ns = NewStringf("%s;",s); + ns = NewString(s); Seek(ns,0,SEEK_SET); scanner_file(ns); top = 0; @@ -7464,7 +7464,7 @@ SwigType *Swig_cparse_type(String *s) { Parm *Swig_cparse_parm(String *s) { String *ns; - ns = NewStringf("%s;",s); + ns = NewString(s); Seek(ns,0,SEEK_SET); scanner_file(ns); top = 0; @@ -7480,9 +7480,9 @@ ParmList *Swig_cparse_parms(String *s, Node *file_line_node) { String *ns; char *cs = Char(s); if (cs && cs[0] != '(') { - ns = NewStringf("(%s);",s); + ns = NewStringf("(%s)",s); } else { - ns = NewStringf("%s;",s); + ns = NewString(s); } Setfile(ns, Getfile(file_line_node)); Setline(ns, Getline(file_line_node)); |