Added assign sample, parses fine, now onto some rules =D

fasterthanlime · Sep 28, 2009 · 21f6cfd · 21f6cfd
1 parent f3e8dad
commit 21f6cfd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,15 @@
+TESTFILE=source/Lexer.ooc
+GDBCOMMANDS_PATH=/tmp/gdbcommands
 .PHONY:all clean mrproper
 
 all:
 	ooc meta -sourcepath=source/:../rock/source/ -g ${OOC_FLAGS}
 
 test:
-	make all && ./meta
+	make all && ./meta ${TESTFILE}
+
+debug:
+	echo run ${TESTFILE} >> ${GDBCOMMANDS_PATH} && gdb ./meta -command=${GDBCOMMANDS_PATH} && rm ${GDBCOMMANDS_PATH}
 
 clean:
 	rm -rf ooc_tmp/

diff --git a/samples/assign.ooc b/samples/assign.ooc
@@ -0,0 +1 @@
+var1=var2
diff --git a/source/Lexer.ooc b/source/Lexer.ooc
@@ -16,18 +16,20 @@ Lexer: class {
 	rules: ArrayList<Rule>
 
 	init: func {
-		rules := ArrayList<Rule> new()
+
+		rules = ArrayList<Rule> new()
+
 	}
 
 	parse: func (path: String) {
 
 		sReader := SourceReader getReaderFromPath(path)
 		tokens := Tokenizer new() parse(sReader)
 
-		"Got tokens: " println()
 		for(token: Token in tokens) {
-			printf("%s ", token toString())
+			printf("%s ", token toString(sReader))
 		}
+		println()
 
 		for(rule in rules) {
 

diff --git a/source/rules/TokenRule.ooc b/source/rules/TokenRule.ooc
@@ -1,7 +1,7 @@
 import frontend/SourceReader
-import MetaNode
+import ../Lexer
 
-TokenMetaNode: class extends MetaNode {
+TokenRule: class extends MetaNode {
 
 	string : String