Module Name:    src
Committed By:   christos
Date:           Mon Dec 30 22:32:45 UTC 2013

Modified Files:
        src/sys/external/bsd/acpica/dist/compiler: aslcompiler.y dtparser.y
            prparser.y

Log Message:
Now that our yacc supports providing yytname[] and does the name protection
automatically (as it should, unlike bison), elide the name protection hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
    src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/sys/external/bsd/acpica/dist/compiler/dtparser.y
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/sys/external/bsd/acpica/dist/compiler/prparser.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.1.1.4 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.2
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.1.1.4	Fri Dec 27 13:46:05 2013
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y	Mon Dec 30 17:32:45 2013
@@ -72,7 +72,9 @@ void *                      AslLocalAllo
 #define static
 #undef alloca
 #define alloca              AslLocalAllocate
+#ifndef yytname
 #define yytname             AslCompilername
+#endif
 
 #define YYINITDEPTH         600             /* State stack depth */
 #define YYDEBUG             1               /* Enable debug output */

Index: src/sys/external/bsd/acpica/dist/compiler/dtparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.1.1.2 src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.2
--- src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.1.1.2	Fri Dec 27 13:46:09 2013
+++ src/sys/external/bsd/acpica/dist/compiler/dtparser.y	Mon Dec 30 17:32:45 2013
@@ -58,7 +58,9 @@ UINT64                      DtParserResu
 
 /* Bison/yacc configuration */
 
+#ifndef yytname
 #define yytname             DtParsername
+#endif
 #define YYDEBUG             1               /* Enable debug output */
 #define YYERROR_VERBOSE     1               /* Verbose error messages */
 #define YYFLAG              -32768

Index: src/sys/external/bsd/acpica/dist/compiler/prparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.1.1.1 src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.2
--- src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.1.1.1	Fri Dec 27 13:46:10 2013
+++ src/sys/external/bsd/acpica/dist/compiler/prparser.y	Mon Dec 30 17:32:45 2013
@@ -57,7 +57,9 @@ UINT64                      PrParserResu
 
 /* Bison/yacc configuration */
 
+#ifndef yytname
 #define yytname             PrParsername
+#endif
 #define YYDEBUG             1               /* Enable debug output */
 #define YYERROR_VERBOSE     1               /* Verbose error messages */
 #define YYFLAG              -32768

Reply via email to