Portability fixes: include config.h to get rid of inline if necessary, remove

last // comments, and include a local strdup.

svn path=/trunk/yasm/; revision=588

diff --git a/tools/re2c/Makefile.am b/tools/re2c/Makefile.am
index c66920ba89ad4752234888aab8036a862f1c66ee..b024f23d01aa4667970163d83560a7d1ab2340b6 100644 (file)
--- a/tools/re2c/Makefile.am
+++ b/tools/re2c/Makefile.am
@@ -1,6 +1,8 @@
 # $IdPath$
 AM_YFLAGS = -d
 
+INCLUDES = -I$(top_srcdir)
+
 noinst_PROGRAMS = re2c
 
 re2c_SOURCES = \

diff --git a/tools/re2c/Makefile.inc b/tools/re2c/Makefile.inc
index c66920ba89ad4752234888aab8036a862f1c66ee..b024f23d01aa4667970163d83560a7d1ab2340b6 100644 (file)
--- a/tools/re2c/Makefile.inc
+++ b/tools/re2c/Makefile.inc
@@ -1,6 +1,8 @@
 # $IdPath$
 AM_YFLAGS = -d
 
+INCLUDES = -I$(top_srcdir)
+
 noinst_PROGRAMS = re2c
 
 re2c_SOURCES = \

diff --git a/tools/re2c/actions.c b/tools/re2c/actions.c
index bd2fb9192b7c01ea41d88fd60c2d608901400cea..32fdd170f5e661a705d1e6173b353aff690c29d3 100644 (file)
--- a/tools/re2c/actions.c
+++ b/tools/re2c/actions.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <time.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/tools/re2c/code.c b/tools/re2c/code.c
index 0e7aa3a02bbaef5ef514180359561956c578861b..9460e25a31c6afb5241c700955314c861825370a 100644 (file)
--- a/tools/re2c/code.c
+++ b/tools/re2c/code.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -10,7 +12,7 @@
  */
 
 void Go_compact(Go *g){
-    // arrange so that adjacent spans have different targets
+    /* arrange so that adjacent spans have different targets */
     uint i = 0, j;
     for(j = 1; j < g->nSpans; ++j){
        if(g->span[j].to != g->span[i].to){

diff --git a/tools/re2c/dfa.c b/tools/re2c/dfa.c
index 98925144c1bddeb2c4642180ad458f6ca570475d..aa6d50b377727a748b6aceb97375ad676ddb869a 100644 (file)
--- a/tools/re2c/dfa.c
+++ b/tools/re2c/dfa.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>

diff --git a/tools/re2c/main.c b/tools/re2c/main.c
index 54cd35e5dfe0d354993bd75718000913c3b1d4fc..e571697cd48d2d7b843b4177077d2194c59c3ced 100644 (file)
--- a/tools/re2c/main.c
+++ b/tools/re2c/main.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/tools/re2c/parser.y b/tools/re2c/parser.y
index 8bba2e79944fb4162f14651b562d33db79b04114..d9701bee83c78549cbeb75b945d9b536910db448 100644 (file)
--- a/tools/re2c/parser.y
+++ b/tools/re2c/parser.y
@@ -1,4 +1,5 @@
 %{
+#include <config.h>
 
 #include <time.h>
 #include <stdio.h>
@@ -127,6 +128,18 @@ int yylex(){
     return Scanner_scan(in);
 }
 
+char *
+mystrdup(const char *str)
+{
+       size_t len;
+       char *copy;
+
+       len = strlen(str) + 1;
+       copy = malloc(len);
+       memcpy(copy, str, len);
+       return (copy);
+}
+
 void parse(FILE *i, FILE *o){
     char *     fnamebuf;
     char *     token;
@@ -142,9 +155,9 @@ void parse(FILE *i, FILE *o){
 
     fprintf(o, "#line %u \"", Scanner_line(in));
     if( fileName != NULL ) {
-       fnamebuf = strdup( fileName );
+       fnamebuf = mystrdup( fileName );
     } else {
-       fnamebuf = strdup( "<stdin>" );
+       fnamebuf = mystrdup( "<stdin>" );
     }
     token = strtok( fnamebuf, "\\" );
     for(;;) {

diff --git a/tools/re2c/re2c-parser.y b/tools/re2c/re2c-parser.y
index 8bba2e79944fb4162f14651b562d33db79b04114..d9701bee83c78549cbeb75b945d9b536910db448 100644 (file)
--- a/tools/re2c/re2c-parser.y
+++ b/tools/re2c/re2c-parser.y
@@ -1,4 +1,5 @@
 %{
+#include <config.h>
 
 #include <time.h>
 #include <stdio.h>
@@ -127,6 +128,18 @@ int yylex(){
     return Scanner_scan(in);
 }
 
+char *
+mystrdup(const char *str)
+{
+       size_t len;
+       char *copy;
+
+       len = strlen(str) + 1;
+       copy = malloc(len);
+       memcpy(copy, str, len);
+       return (copy);
+}
+
 void parse(FILE *i, FILE *o){
     char *     fnamebuf;
     char *     token;
@@ -142,9 +155,9 @@ void parse(FILE *i, FILE *o){
 
     fprintf(o, "#line %u \"", Scanner_line(in));
     if( fileName != NULL ) {
-       fnamebuf = strdup( fileName );
+       fnamebuf = mystrdup( fileName );
     } else {
-       fnamebuf = strdup( "<stdin>" );
+       fnamebuf = mystrdup( "<stdin>" );
     }
     token = strtok( fnamebuf, "\\" );
     for(;;) {

diff --git a/tools/re2c/re2c.c b/tools/re2c/re2c.c
index 54cd35e5dfe0d354993bd75718000913c3b1d4fc..e571697cd48d2d7b843b4177077d2194c59c3ced 100644 (file)
--- a/tools/re2c/re2c.c
+++ b/tools/re2c/re2c.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/tools/re2c/scanner.c b/tools/re2c/scanner.c
index 2a7b00c15f1b8004d1c09ac975e0def88b9f7c2f..6bca641dadd7254131b8a7f69fb11c4cfd8ac936 100644 (file)
--- a/tools/re2c/scanner.c
+++ b/tools/re2c/scanner.c
@@ -1,5 +1,8 @@
-/* Generated by re2c 0.9.1-C on Thu Apr 11 00:10:49 2002 */
+/* Generated by re2c 0.9.1-C on Thu Apr 11 22:20:20 2002
+ */
 #line 1 "scanner.re"
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include "scanner.h"
@@ -63,7 +66,7 @@ fill(Scanner *s, uchar *cursor)
     return cursor;
 }
 
-#line 73
+#line 75
 
 
 int
@@ -86,11 +89,11 @@ yy2:        yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == '*') goto yy7;
 yy3:
-#line 89
+#line 91
        { goto echo; }
 yy4:   yych = *++YYCURSOR;
 yy5:
-#line 85
+#line 87
        { if(cursor == s->eof) RETURN(0);
                                  fwrite(s->tok, 1, cursor - s->tok, out);
                                  s->tok = s->pos = cursor; s->cline++;
@@ -113,12 +116,12 @@ yy12:     yych = *++YYCURSOR;
        if(yych != 'c') goto yy8;
 yy13:  yych = *++YYCURSOR;
 yy14:
-#line 82
+#line 84
        { fwrite(s->tok, 1, &cursor[-7] - s->tok, out);
                                  s->tok = cursor;
                                  RETURN(1); }
 }
-#line 90
+#line 92
 
 }
 
@@ -188,32 +191,32 @@ yy15:
        }
 yy17:  yych = *++YYCURSOR;
 yy18:
-#line 105
+#line 107
        { depth = 1;
                                  goto code;
                                }
 yy19:  yych = *++YYCURSOR;
        if(yych == '*') goto yy54;
 yy20:
-#line 124
+#line 126
        { RETURN(*s->tok); }
 yy21:  yych = *++YYCURSOR;
        if(yych == '/') goto yy52;
 yy22:
-#line 126
+#line 128
        { yylval.op = *s->tok;
                                  RETURN(CLOSE); }
 yy23:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy48;
 yy24:
-#line 117
+#line 119
        { Scanner_fatal(s, "bad string"); }
 yy25:  yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy42;
 yy26:
-#line 122
+#line 124
        { Scanner_fatal(s, "bad character constant"); }
 yy27:  yych = *++YYCURSOR;
        goto yy20;
@@ -222,7 +225,7 @@ yy28:       yych = *++YYCURSOR;
 yy29:  yych = *++YYCURSOR;
        goto yy40;
 yy30:
-#line 129
+#line 131
        { SubStr substr;
                                  s->cur = cursor;
                                  substr = Scanner_token(s);
@@ -231,18 +234,18 @@ yy30:
 yy31:  yych = *++YYCURSOR;
        goto yy38;
 yy32:
-#line 135
+#line 137
        { goto scan; }
 yy33:  yych = *++YYCURSOR;
 yy34:
-#line 137
+#line 139
        { if(cursor == s->eof) RETURN(0);
                                  s->pos = cursor; s->cline++;
                                  goto scan;
                                }
 yy35:  yych = *++YYCURSOR;
 yy36:
-#line 142
+#line 144
        { fprintf(stderr, "unexpected character: '%c'\n", *s->tok);
                                  goto scan;
                                }
@@ -287,7 +290,7 @@ yy44:       ++YYCURSOR;
        goto yy41;
 yy45:  yych = *++YYCURSOR;
 yy46:
-#line 119
+#line 121
        { s->cur = cursor;
                                  yylval.regexp = ranToRE(Scanner_token(s));
                                  return RANGE; }
@@ -308,22 +311,22 @@ yy49:     ++YYCURSOR;
        goto yy47;
 yy50:  yych = *++YYCURSOR;
 yy51:
-#line 114
+#line 116
        { s->cur = cursor;
                                  yylval.regexp = strToRE(Scanner_token(s));
                                  return STRING; }
 yy52:  yych = *++YYCURSOR;
 yy53:
-#line 111
+#line 113
        { s->tok = cursor;
                                  RETURN(0); }
 yy54:  yych = *++YYCURSOR;
 yy55:
-#line 108
+#line 110
        { depth = 1;
                                  goto comment; }
 }
-#line 145
+#line 147
 
 
 code:
@@ -354,7 +357,7 @@ yy56:
        }
 yy58:  yych = *++YYCURSOR;
 yy59:
-#line 149
+#line 151
        { if(--depth == 0){
                                        s->cur = cursor;
                                        yylval.token = Token_new(Scanner_token(s), s->tline);
@@ -363,19 +366,19 @@ yy59:
                                  goto code; }
 yy60:  yych = *++YYCURSOR;
 yy61:
-#line 155
+#line 157
        { ++depth;
                                  goto code; }
 yy62:  yych = *++YYCURSOR;
 yy63:
-#line 157
+#line 159
        { if(cursor == s->eof) Scanner_fatal(s, "missing '}'");
                                  s->pos = cursor; s->cline++;
                                  goto code;
                                }
 yy64:  yych = *++YYCURSOR;
 yy65:
-#line 161
+#line 163
        { goto code; }
 yy66:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -420,7 +423,7 @@ yy74:       ++YYCURSOR;
        if(yych == '\n')        goto yy70;
        goto yy72;
 }
-#line 162
+#line 164
 
 
 comment:
@@ -443,14 +446,14 @@ yy75:
 yy77:  yych = *++YYCURSOR;
        if(yych == '/') goto yy85;
 yy78:
-#line 176
+#line 178
        { goto comment; }
 yy79:  yych = *++YYCURSOR;
        if(yych == '*') goto yy83;
        goto yy78;
 yy80:  yych = *++YYCURSOR;
 yy81:
-#line 172
+#line 174
        { if(cursor == s->eof) RETURN(0);
                                  s->tok = s->pos = cursor; s->cline++;
                                  goto comment;
@@ -459,18 +462,18 @@ yy82:     yych = *++YYCURSOR;
        goto yy78;
 yy83:  yych = *++YYCURSOR;
 yy84:
-#line 170
+#line 172
        { ++depth;
                                  goto comment; }
 yy85:  yych = *++YYCURSOR;
 yy86:
-#line 166
+#line 168
        { if(--depth == 0)
                                        goto scan;
                                    else
                                        goto comment; }
 }
-#line 177
+#line 179
 
 }
 

diff --git a/tools/re2c/scanner.re b/tools/re2c/scanner.re
index 146b163fc1ff9f3f99975d5918f613a4ac9f6736..2cd32ed9e6560f12d6096a4155d8919d147b0ef4 100644 (file)
--- a/tools/re2c/scanner.re
+++ b/tools/re2c/scanner.re
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include "scanner.h"

diff --git a/tools/re2c/substr.c b/tools/re2c/substr.c
index de18f0d16f00c093136d89ea388ee94f7c2d1b12..c88dcb63105aa6c2b89a9136318192e443448761 100644 (file)
--- a/tools/re2c/substr.c
+++ b/tools/re2c/substr.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <string.h>
 #include "substr.h"
 

diff --git a/tools/re2c/translate.c b/tools/re2c/translate.c
index 2eeaabf0e955e79e6ff0b602de606c4b4d0c45cd..d3356b8607a562b3e2c1a4994f65b2894b06a7a1 100644 (file)
--- a/tools/re2c/translate.c
+++ b/tools/re2c/translate.c
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include "globals.h"
 
 uchar asc2asc[256] = {