jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic rename COPERATOR to CONVERSIONOPERATOR

Browse source 
Was never very obvious what C in COPERATOR was.
This commit is contained in:
William S Fulton 2015-05-01 19:26:09 +01:00
commit 463b2a324c
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/CParse/cscanner.c
View file

@ -722,7 +722,7 @@ int yylex(void) {
Setfile(cs,cparse_file); Setfile(cs,cparse_file);
Scanner_push(scan,cs); Scanner_push(scan,cs);
Delete(cs); Delete(cs);
return COPERATOR; return CONVERSIONOPERATOR;
} }
} }
if (termtoken) if (termtoken)

18
Source/CParse/parser.y
View file

@ -1372,7 +1372,7 @@ static void mark_nodes_as_extend(Node *n) {
%token NONID DSTAR DCNOT %token NONID DSTAR DCNOT
%token <intvalue> TEMPLATE %token <intvalue> TEMPLATE
%token <str> OPERATOR %token <str> OPERATOR
%token <str> COPERATOR %token <str> CONVERSIONOPERATOR
%token PARSETYPE PARSEPARM PARSEPARMS %token PARSETYPE PARSEPARM PARSEPARMS
%left CAST %left CAST
@ -1530,11 +1530,11 @@ declaration : swig_directive { $$ = $1; }
This is nearly impossible to parse normally. We just let the This is nearly impossible to parse normally. We just let the
first part generate a syntax error and then resynchronize on the first part generate a syntax error and then resynchronize on the
COPERATOR token---discarding the rest of the definition. Ugh. CONVERSIONOPERATOR token---discarding the rest of the definition. Ugh.
*/ */
| error COPERATOR { | error CONVERSIONOPERATOR {
$$ = 0; $$ = 0;
skip_decl(); skip_decl();
} }
@ -4435,7 +4435,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
/* C++ type conversion operator */ /* C++ type conversion operator */
cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAREN cpp_vend { cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN parms RPAREN cpp_vend {
$$ = new_node("cdecl"); $$ = new_node("cdecl");
Setattr($$,"type",$3); Setattr($$,"type",$3);
Setattr($$,"name",$2); Setattr($$,"name",$2);
@ -4450,7 +4450,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
Setattr($$,"conversion_operator","1"); Setattr($$,"conversion_operator","1");
add_symbols($$); add_symbols($$);
} }
| storage_class COPERATOR type AND LPAREN parms RPAREN cpp_vend { | storage_class CONVERSIONOPERATOR type AND LPAREN parms RPAREN cpp_vend {
SwigType *decl; SwigType *decl;
$$ = new_node("cdecl"); $$ = new_node("cdecl");
Setattr($$,"type",$3); Setattr($$,"type",$3);
@ -4467,7 +4467,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
Setattr($$,"conversion_operator","1"); Setattr($$,"conversion_operator","1");
add_symbols($$); add_symbols($$);
} }
| storage_class COPERATOR type LAND LPAREN parms RPAREN cpp_vend { | storage_class CONVERSIONOPERATOR type LAND LPAREN parms RPAREN cpp_vend {
SwigType *decl; SwigType *decl;
$$ = new_node("cdecl"); $$ = new_node("cdecl");
Setattr($$,"type",$3); Setattr($$,"type",$3);
@ -4485,7 +4485,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
add_symbols($$); add_symbols($$);
} }
| storage_class COPERATOR type pointer AND LPAREN parms RPAREN cpp_vend { | storage_class CONVERSIONOPERATOR type pointer AND LPAREN parms RPAREN cpp_vend {
SwigType *decl; SwigType *decl;
$$ = new_node("cdecl"); $$ = new_node("cdecl");
Setattr($$,"type",$3); Setattr($$,"type",$3);
@ -4504,7 +4504,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
add_symbols($$); add_symbols($$);
} }
| storage_class COPERATOR type LPAREN parms RPAREN cpp_vend { | storage_class CONVERSIONOPERATOR type LPAREN parms RPAREN cpp_vend {
String *t = NewStringEmpty(); String *t = NewStringEmpty();
$$ = new_node("cdecl"); $$ = new_node("cdecl");
Setattr($$,"type",$3); Setattr($$,"type",$3);
@ -6471,7 +6471,7 @@ idcolontail : DCOLON idtemplate idcolontail {
| DCOLON OPERATOR { | DCOLON OPERATOR {
$$ = NewStringf("::%s",$2); $$ = NewStringf("::%s",$2);
} }
/* | DCOLON COPERATOR { /* | DCOLON CONVERSIONOPERATOR {
$$ = NewString($2); $$ = NewString($2);
} */ } */