Fixes for compilation by the Digital Mars Compiler. Submitted by Scott Michel.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5728 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-02-20 22:51:47 +00:00
commit 0d2ef5a3ce
2 changed files with 5 additions and 5 deletions

View file

@ -1188,7 +1188,7 @@ int yylex(void) {
return(TEMPLATE); return(TEMPLATE);
} }
if (strcmp(yytext,"delete") == 0) { if (strcmp(yytext,"delete") == 0) {
return(DELETE); return(DELETE_KW);
} }
if (strcmp(yytext,"using") == 0) { if (strcmp(yytext,"using") == 0) {
return(USING); return(USING);
@ -1219,7 +1219,7 @@ int yylex(void) {
/* Misc keywords */ /* Misc keywords */
if (strcmp(yytext,"extern") == 0) return(EXTERN); if (strcmp(yytext,"extern") == 0) return(EXTERN);
if (strcmp(yytext,"const") == 0) return(CONST); if (strcmp(yytext,"const") == 0) return(CONST_QUAL);
if (strcmp(yytext,"static") == 0) return(STATIC); if (strcmp(yytext,"static") == 0) return(STATIC);
if (strcmp(yytext,"struct") == 0) return(STRUCT); if (strcmp(yytext,"struct") == 0) return(STRUCT);
if (strcmp(yytext,"union") == 0) return(UNION); if (strcmp(yytext,"union") == 0) return(UNION);

View file

@ -871,7 +871,7 @@ Node *Swig_cparse(File *f) {
%token <ivalue> TYPEDEF %token <ivalue> TYPEDEF
%token <type> TYPE_INT TYPE_UNSIGNED TYPE_SHORT TYPE_LONG TYPE_FLOAT TYPE_DOUBLE TYPE_CHAR TYPE_VOID TYPE_SIGNED TYPE_BOOL TYPE_TYPEDEF TYPE_RAW %token <type> TYPE_INT TYPE_UNSIGNED TYPE_SHORT TYPE_LONG TYPE_FLOAT TYPE_DOUBLE TYPE_CHAR TYPE_VOID TYPE_SIGNED TYPE_BOOL TYPE_TYPEDEF TYPE_RAW
%token LPAREN RPAREN COMMA SEMI EXTERN INIT LBRACE RBRACE PERIOD %token LPAREN RPAREN COMMA SEMI EXTERN INIT LBRACE RBRACE PERIOD
%token CONST VOLATILE STRUCT UNION EQUAL SIZEOF MODULE LBRACKET RBRACKET %token CONST_QUAL VOLATILE STRUCT UNION EQUAL SIZEOF MODULE LBRACKET RBRACKET
%token ILLEGAL CONSTANT %token ILLEGAL CONSTANT
%token NAME RENAME NAMEWARN EXTEND PRAGMA FEATURE VARARGS %token NAME RENAME NAMEWARN EXTEND PRAGMA FEATURE VARARGS
%token ENUM %token ENUM
@ -881,7 +881,7 @@ Node *Swig_cparse(File *f) {
%token NATIVE INLINE %token NATIVE INLINE
%token TYPEMAP EXCEPT ECHO APPLY CLEAR SWIGTEMPLATE FRAGMENT %token TYPEMAP EXCEPT ECHO APPLY CLEAR SWIGTEMPLATE FRAGMENT
%token WARN %token WARN
%token LESSTHAN GREATERTHAN MODULO DELETE %token LESSTHAN GREATERTHAN MODULO DELETE_KW
%token TYPES PARMS %token TYPES PARMS
%token NONID DSTAR DCNOT %token NONID DSTAR DCNOT
%token <ivalue> TEMPLATE %token <ivalue> TEMPLATE
@ -4084,7 +4084,7 @@ type_qualifier : type_qualifier_raw {
} }
; ;
type_qualifier_raw : CONST { $$ = "const"; } type_qualifier_raw : CONST_QUAL { $$ = "const"; }
| VOLATILE { $$ = "volatile"; } | VOLATILE { $$ = "volatile"; }
; ;