Commit c1653557 authored by David Gobbi's avatar David Gobbi Committed by Marcus D. Hanwell
Browse files

ENH: parse "inline" to allow wrapping of methods marked as inline

parent 0c61e3aa
This diff is collapsed.
......@@ -187,6 +187,7 @@ Modify lex.yy.c:
"operator" return(OPERATOR);
"unsigned" return(UNSIGNED);
"friend" return(FRIEND);
"inline" return(INLINE);
"static" return(STATIC);
"vtkFloatingPointType" return(DOUBLE);
......
This diff is collapsed.
......@@ -234,6 +234,7 @@ char *vtkstrdup(const char *in)
%token OPERATOR
%token UNSIGNED
%token FRIEND
%token INLINE
%token <str> VTK_ID
%token STATIC
%token VAR_FUNCTION
......@@ -305,8 +306,10 @@ class_def_body: class_def_item | class_def_item class_def_body;
class_def_item: scope_type ':' | var
| operator
| FRIEND operator
| INLINE operator
| function func_body { output_function(); }
| FRIEND function func_body { output_function(); }
| INLINE function func_body { output_function(); }
| legacy_function func_body { legacySig(); output_function(); }
| macro ';'
| macro;
......@@ -339,6 +342,7 @@ function: '~' func { preSig("~"); }
preSig("virtual ");
};
operator:
operator_sig
{
......@@ -1118,7 +1122,7 @@ other_stuff : ';' | other_stuff_no_semi;
other_stuff_no_semi : OTHER | braces | parens | '*' | '=' | ':' | ',' | '.'
| STRING | type_red2 | type_string2 | NUM | CLASS_REF | '&' | brackets
| CONST | OPERATOR | '-' | '~' | STATIC | ARRAY_NUM;
| CONST | OPERATOR | '-' | '~' | STATIC | INLINE | ARRAY_NUM;
braces: '{' maybe_other '}';
parens: '(' maybe_other ')';
......
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