Use FAUST prefix in lex/yacc parser.

grame-cncm · Feb 27, 2023 · cb8d0a2 · cb8d0a2
1 parent 8380fe0
commit cb8d0a2
Show file tree

Hide file tree

Showing 12 changed files with 651 additions and 638 deletions.
diff --git a/compiler/errors/errormsg.cpp b/compiler/errors/errormsg.cpp
@@ -30,7 +30,7 @@
 #include <iostream>
 using namespace std;
 
-const char* yyfilename = "????";
+const char* FAUSTfilename = "????";
 
 void faustassertaux(bool cond, const string& file, int line)
 {
@@ -61,10 +61,10 @@ void lexerror(const char* msg)
     throw faustexception(fullmsg);
 }
 
-void yyerror(const char* msg)
+void FAUSTerror(const char* msg)
 {
     stringstream error;
-    error << yyfilename << " : " << yylineno << " : ERROR : " << msg << endl;
+    error << FAUSTfilename << " : " << FAUSTlineno << " : ERROR : " << msg << endl;
     gGlobal->gErrorCount++;
     throw faustexception(error.str());
 }

diff --git a/compiler/errors/errormsg.hh b/compiler/errors/errormsg.hh
@@ -24,8 +24,9 @@
 
 #include "tlib.hh"
 
-extern int         yylineno;
-extern const char* yyfilename;
+// Globals for flex/bison parser
+extern int         FAUSTlineno;
+extern const char* FAUSTfilename;
 
 // associate and retrieve file and line properties to a symbol definition
 void setDefProp(Tree sym, const char* filename, int lineno);
@@ -41,7 +42,7 @@ int         getUseLineProp(Tree sym);
 
 // Parsing error
 void lexerror(const char* msg);
-void yyerror(const char* msg);
+void FAUSTerror(const char* msg);
 
 // three levels or errors, warnings and remarks are provided during evaluation
 void evalerror(const char* filename, int linenum, const char* msg, Tree exp);

diff --git a/compiler/evaluate/eval.cpp b/compiler/evaluate/eval.cpp
@@ -201,7 +201,7 @@ static Tree real_a2sb(Tree exp)
             return abstr;
 
         } else {
-            evalerror(yyfilename, -1, "a2sb : internal error : not an abstraction inside closure (1)", exp);
+            evalerror(FAUSTfilename, -1, "a2sb : internal error : not an abstraction inside closure (1)", exp);
             // Never reached since evalerror throws an exception
             return 0;
         }
@@ -720,7 +720,7 @@ static double eval2double(Tree exp, Tree visited, Tree localValEnv)
     int  numInputs, numOutputs;
     getBoxType(diagram, &numInputs, &numOutputs);
     if ((numInputs > 0) || (numOutputs != 1)) {
-        evalerror(yyfilename, yylineno, "not a constant expression of type : (0->1)", exp);
+        evalerror(FAUSTfilename, FAUSTlineno, "not a constant expression of type : (0->1)", exp);
         // Never reached since evalerror throws an exception
         return 1;
     } else {
@@ -749,7 +749,7 @@ static int eval2int(Tree exp, Tree visited, Tree localValEnv)
     int  numInputs, numOutputs;
     getBoxType(diagram, &numInputs, &numOutputs);
     if ((numInputs > 0) || (numOutputs != 1)) {
-        evalerror(yyfilename, yylineno, "not a constant expression of type : (0->1)", exp);
+        evalerror(FAUSTfilename, FAUSTlineno, "not a constant expression of type : (0->1)", exp);
         // Never reached since evalerror throws an exception
         return 1;
     } else {
@@ -1160,7 +1160,7 @@ static Tree applyList(Tree fun, Tree larg)
 
     // Here fun is a closure, we can test the content of abstr
     if (isBoxEnvironment(abstr)) {
-        evalerrorbox(yyfilename, -1, "an environment can't be used as a function", fun);
+        evalerrorbox(FAUSTfilename, -1, "an environment can't be used as a function", fun);
     }
 
     if (isBoxIdent(abstr)) {
@@ -1170,7 +1170,7 @@ static Tree applyList(Tree fun, Tree larg)
     }
 
     if (!isBoxAbstr(abstr, id, body)) {
-        evalerror(yyfilename, -1, "(internal) not an abstraction inside closure (2)", fun);
+        evalerror(FAUSTfilename, -1, "(internal) not an abstraction inside closure (2)", fun);
     }
 
     // Here abstr is an abstraction, we can test the content of abstr.
@@ -1223,7 +1223,7 @@ static Tree revEvalList(Tree lexp, Tree visited, Tree localValEnv)
 static Tree larg2par(Tree larg)
 {
     if (isNil(larg)) {
-        evalerror(yyfilename, -1, "empty list of arguments", larg);
+        evalerror(FAUSTfilename, -1, "empty list of arguments", larg);
     }
     if (isNil(tl(larg))) {
         return hd(larg);

diff --git a/compiler/global.cpp b/compiler/global.cpp
@@ -106,9 +106,9 @@
 
 using namespace std;
 
-// Globals for lex/yack parser
-extern FILE*       yyin;
-extern const char* yyfilename;
+// Globals for flex/bison parser
+extern FILE*       FAUSTin;
+extern const char* FAUSTfilename;
 
 // Garbageable globals
 list<Garbageable*> global::gObjectTable;
@@ -614,9 +614,9 @@ void global::init()
 
     PROPAGATEPROPERTY = symbol("PropagateProperty");
 
-    // yyfilename is defined in errormsg.cpp but must be redefined at each compilation.
-    yyfilename = "";
-    yyin       = nullptr;
+    // FAUSTfilename is defined in errormsg.cpp but must be redefined at each compilation.
+    FAUSTfilename = "";
+    FAUSTin       = nullptr;
 
     gLatexheaderfilename = "latexheader.tex";
     gDocTextsDefaultFile = "mathdoctexts-default.txt";

diff --git a/compiler/parser/Makefile b/compiler/parser/Makefile
@@ -3,16 +3,18 @@ OUT  = faustlexer.cpp faustparser.cpp faustparser.hpp
 YACC = bison
 LEX = flex
 PREFIX := FAUST
-#OPTIONS:= -I -P$(PREFIX)
+LEX_OPTIONS:= -P$(PREFIX)
+YACC_OPTIONS:= -p$(PREFIX)
 
 code : $(OUT)
 
 faustparser.hpp : faustparser.y
 faustparser.cpp : faustparser.y
-	$(YACC) -d -o faustparser.cpp $(OPTIONS) faustparser.y
+	$(YACC) -d -o faustparser.cpp $(YACC_OPTIONS) faustparser.y
 
 faustlexer.cpp : faustlexer.l
-	$(LEX) -I -ofaustlexer.cpp $(OPTIONS) faustlexer.l
+	$(LEX) -I -ofaustlexer.cpp $(LEX_OPTIONS) faustlexer.l
 
 clean:
-	rm -f $(OUT)
+	rm -f $(OUT)
+