Commit 37ad6b6e authored by David Gobbi's avatar David Gobbi
Browse files

COMP: make vtkParse.y allow vtkUnicodeString etc. as a scope

parent c9d9f72b
This diff is collapsed.
...@@ -989,13 +989,7 @@ maybe_scoped_id: ID {$<str>$ = $<str>1; postSig($<str>1);} ...@@ -989,13 +989,7 @@ maybe_scoped_id: ID {$<str>$ = $<str>1; postSig($<str>1);}
| templated_id {$<str>$ = $<str>1;}; | templated_id {$<str>$ = $<str>1;};
| scoped_id {$<str>$ = $<str>1;}; | scoped_id {$<str>$ = $<str>1;};
scoped_id: ID DOUBLE_COLON maybe_scoped_id scoped_id: class_id DOUBLE_COLON maybe_scoped_id
{
$<str>$ = (char *)malloc(strlen($<str>1)+strlen($<str>3)+3);
sprintf($<str>$, "%s::%s", $<str>1, $<str>3);
preScopeSig($<str>1);
}
| VTK_ID DOUBLE_COLON maybe_scoped_id
{ {
$<str>$ = (char *)malloc(strlen($<str>1)+strlen($<str>3)+3); $<str>$ = (char *)malloc(strlen($<str>1)+strlen($<str>3)+3);
sprintf($<str>$, "%s::%s", $<str>1, $<str>3); sprintf($<str>$, "%s::%s", $<str>1, $<str>3);
...@@ -1008,6 +1002,14 @@ scoped_id: ID DOUBLE_COLON maybe_scoped_id ...@@ -1008,6 +1002,14 @@ scoped_id: ID DOUBLE_COLON maybe_scoped_id
preScopeSig(""); preScopeSig("");
}; };
class_id: ID { $<str>$ = $<str>1; }
| VTK_ID { $<str>$ = $<str>1; }
| ISTREAM { $<str>$ = vtkstrdup("istream"); }
| OSTREAM { $<str>$ = vtkstrdup("ostream"); }
| StdString { $<str>$ = vtkstrdup("vtkStdString"); }
| UnicodeString { $<str>$ = vtkstrdup("vtkUnicodeString"); };
/* & is VTK_PARSE_REF /* & is VTK_PARSE_REF
* is VTK_PARSE_POINTER * is VTK_PARSE_POINTER
*& is VTK_PARSE_POINTER_REF *& is VTK_PARSE_POINTER_REF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment