Changeset 76934fb for src/Parser

Timestamp:

Jun 1, 2015, 12:55:33 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

6db50d5

Parents:

46cbfe1 (diff), db82596 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into labels

Location:

src/Parser

Files:

• Parser.cc (modified) (2 diffs)
• lex.cc (added)
• lex.ll (moved) (moved from src/Parser/lex.l ) (2 diffs)
• module.mk (modified) (2 diffs)
• parser.cc (added)
• parser.h (added)
• parser.yy (moved) (moved from src/Parser/cfa.y ) (1 diff)

src/Parser/Parser.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:54:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 14:55:59 2015
-// Update Count     : 2
+// Last Modified On : Sun May 31 23:45:19 2015
+// Update Count     : 4
 // 
 
@@ -17 +17 @@
 #include "TypedefTable.h"
 #include "lex.h"
-#include "cfa.tab.h"
+#include "parser.h"
 
 // global variables in cfa.y

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue May 19 15:41:54 2015
- * Update Count     : 331
+ * Last Modified On : Sun May 31 23:41:32 2015
+ * Update Count     : 334
  */
 
@@ -27 +27 @@
 #include "lex.h"
 #include "ParseNode.h"
-#include "cfa.tab.h"                                                                    // YACC generated definitions based on C++ grammar
+#include "parser.h"                                                                     // YACC generated definitions based on C++ grammar
 
 char *yyfilename;

src/Parser/module.mk

@@ -8 +8 @@
 ## module.mk -- 
 ##
-## Author           : Richard C. Bilson
+## Author           : Peter A. Buhr
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu May 21 21:17:07 2015
-## Update Count     : 2
+## Last Modified On : Mon Jun  1 08:16:25 2015
+## Update Count     : 83
 ###############################################################################
 
-YACC=bison
-YFLAGS=-d --debug -v
-LEX=flex
-LFLAGS=
+BUILT_SOURCES = Parser/parser.h
 
-SRC += Parser/cfa.y \
-       Parser/lex.l \
+AM_YFLAGS = -d -t -v
+cfa_cpp_LDADD = ${LEXLIB}       # yywrap
+MAINTAINERCLEANFILES = Parser/parser.output
+
+SRC += Parser/parser.yy \
+       Parser/lex.ll \
        Parser/TypedefTable.cc \
        Parser/ParseNode.cc \
@@ -32 +33 @@
        Parser/parseutility.cc \
        Parser/Parser.cc
-
-EXTRA_OUTPUT += Parser/cfa.tab.cc \
-                Parser/cfa.tab.h \
-                Parser/lex.yy.cc \
-                Parser/cfa.output
-
-LIBS += -lfl
-
-Parser/Parser.cc: Parser/cfa.tab.h
-
-Parser/cfa.tab.cc: Parser/cfa.y
-        $(YACC) $(YFLAGS) $< --file-prefix=Parser/cfa
-        -mv Parser/cfa.tab.c Parser/cfa.tab.cc
-
-Parser/cfa.tab.h: Parser/cfa.tab.cc
-
-Parser/lex.yy.cc: Parser/lex.l Parser/cfa.tab.h Parser/TypedefTable.h
-        $(LEX) $(LFLAGS) -o$@ $< 
-
-Parser/lex.yy.o: Parser/lex.yy.cc Parser/ParseNode.h
-        $(CXX) $(CXXFLAGS) -Wno-unused -c -o $@ $<

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 09:20:53 2015
-// Update Count     : 1015
+// Last Modified On : Sun May 31 18:50:30 2015
+// Update Count     : 1016
 //