From b1d3d0453073a058244e9c7d396910d2e60563fd Mon Sep 17 00:00:00 2001
From: Bernhard Urban <lewurm@gmail.com>
Date: Sun, 7 Mar 2010 14:48:17 +0100
Subject: [PATCH] scanner: testfaelle und newline fix fuer kommentare

---
 scanner/Makefile    |  6 ++++--
 scanner/scanner.lex |  2 ++
 scanner/test/1test  | 11 +++++++++++
 scanner/test/2test  |  7 +++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 scanner/test/1test
 create mode 100644 scanner/test/2test

diff --git a/scanner/Makefile b/scanner/Makefile
index 3997a41..8f7f12c 100755
--- a/scanner/Makefile
+++ b/scanner/Makefile
@@ -12,8 +12,10 @@ clean:
 	rm -f $(NAME).o $(NAME) $(NAME).c
 
 1test: $(NAME)
-	@echo "execute ./$(NAME)"
-	@./$(NAME)
+	@echo "execute cat test/1test | ./$(NAME)"
+	@cat test/1test | ./$(NAME)
+	@echo "execute cat test/2test | ./$(NAME)"
+	@cat test/2test | ./$(NAME)
 
 2test:
 	/usr/ftp/pub/ublu/test/$(NAME)/test 2>&1
diff --git a/scanner/scanner.lex b/scanner/scanner.lex
index 6288282..b86baaf 100644
--- a/scanner/scanner.lex
+++ b/scanner/scanner.lex
@@ -22,6 +22,8 @@ COMMENT_END	\*\/
 
 <COMMENT><<EOF>> { (void) fprintf(stderr, "kommentar nicht geschlossen\n"); exit(1); }
 
+<COMMENT>{WHITESPACE} /* ignorieren */
+
 <COMMENT>. /* alles im kommentar wird ignoriert */
 
 {KEYWORD} printf("%s\n", yytext);
diff --git a/scanner/test/1test b/scanner/test/1test
new file mode 100644
index 0000000..9ab5ac8
--- /dev/null
+++ b/scanner/test/1test
@@ -0,0 +1,11 @@
+method blabb
+var foo := 5;
+if foo < 0x0F3 then
+ /* hier
+  kommt komm
+ mentar
+ */
+ foo := foo - 0x3;
+else
+ foo := foo * 4;
+end
diff --git a/scanner/test/2test b/scanner/test/2test
new file mode 100644
index 0000000..8e1597a
--- /dev/null
+++ b/scanner/test/2test
@@ -0,0 +1,7 @@
+method blabb
+var foo := 5;
+if foo < 0x0F3 then
+ foo := foo - 0x3;
+else
+ foo := foo * 4;
+end
-- 
2.25.1