X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Findent_test.mdc;h=463428b7579b1cf32d29ecafdeb43d42a832146d;hb=abd08191347dfb83ac7e1aacf6a6aa3f8f796fcd;hp=540ecd22584868f832ac6b505b48b8088464ed0d;hpb=f8c00ecff941f5f86b4d54dd73cac3680684a11e;p=ocean

diff --git a/csrc/indent_test.mdc b/csrc/indent_test.mdc
index 540ecd2..463428b 100644
--- a/csrc/indent_test.mdc
+++ b/csrc/indent_test.mdc
@@ -4,27 +4,30 @@ simple assignments with expressions, and then prints out the same
 with complete bracketing and indenting.
 
 # File: indent_test.mk
-	myCFLAGS := -Wall -g -fplan9-extensions
-	CFLAGS := $(filter-out $(myCFLAGS),$(CFLAGS)) $(myCFLAGS)
-	myLDLIBS:= libparser.o libscanner.o libmdcode.o -licuuc
-	LDLIBS := $(filter-out $(myLDLIBS),$(LDLIBS)) $(myLDLIBS)
+	itestCFLAGS := -Wall -g -fplan9-extensions
+	itestLDLIBS:= libparser.o libscanner.o libmdcode.o -licuuc
 
 	all :: itest
-	itest.c itest.h : indent_test.mdc parsergen libparser.o libscanner.o libmdcode.o
+	itest.c itest.h : indent_test.mdc parsergen
 		./parsergen -o itest --LALR --tag indent indent_test.mdc
-	indent_test.mk: indent_test.mdc md2c
+	indent_test.mk itest.code: indent_test.mdc md2c
 		./md2c indent_test.mdc
-	itest: itest.c
+	itest: itest.c | $(filter %.o,$(itestLDLIBS))
+		$(CC) $(itestCFLAGS) $^ $(itestLDLIBS) -o $@
 
-	demos:: itest itest.code
+	doitest: itest itest.code
 		./itest itest.code
+	checkitest: itest itest.code
+		@grep -v '^#' itest.out > .tmp.out
+		@./itest itest.code | diff -u .tmp.out - || echo itest FAILED
+		@sed -e 'i\
+		' itest.code > itest2.code
+		@./itest itest2.code| diff -u .tmp.out - || echo itest2 FAILED
+	demos :: doitest
+	tests :: checkitest
 
 # indent: header
 
- ./parsergen -o itest --LALR indent_test.cgm
- cc -o itest itest.c lib*.o -licuuc -lgmp
- ./itest itest.code
-
 	struct expression {
 		struct text op;
 		struct expression *left, *right;
@@ -107,8 +110,6 @@ with complete bracketing and indenting.
 		char *file = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
 		struct section *s = code_extract(file, file+len, NULL);
 		struct token_config config = {
-			.ignored = (1 << TK_line_comment)
-			         | (1 << TK_block_comment),
 			.number_chars = ".,_+-",
 			.word_start = "",
 			.word_cont = "",
@@ -127,13 +128,15 @@ with complete bracketing and indenting.
 
 ~~~~~~
 
-Program -> Statementlist ${ print_statement($1, 0); }$
+$TERM if { } : * + - / ; =
 
-OptNL -> NEWLINE
-	|
+Program -> Statementlist ${ print_statement($1, 0); }$
 
 $*statement
-	Statementlist ->  Statements ${ $0 = $<1; }$
+	Newlines -> NEWLINE
+		| Newlines NEWLINE
+	Statementlist ->  Statements ${ $0 = $<S; }$
+		| Newlines Statements ${ $0 = $<S1; }$
 
 	Statements -> Statements Statement ${
 				{
@@ -149,21 +152,23 @@ $*statement
 			| ERROR ${ printf("statement ERROR\n"); $0 = NULL; }$
 
 	Open -> {
-		| NEWLINE {
+		| Newlines {
 	Close -> }
-		| NEWLINE }
-	Block -> Open Statementlist Close ${ $0 = $<2; }$
-		| Open SimpleStatements } ${ $0 = $<2; }$
-		| : Statementlist ${ $0 = $<2; }$
+		| Newlines }
+	Block -> Open Statementlist Close ${ $0 = $<S; }$
+		| Open SimpleStatements } ${ $0 = $<S; }$
+		| : SimpleStatements ${ $0 = $<SS; }$
+		| : StatementBlock ${ $0 = $<SB; }$
+	StatementBlock -> Statementlist ${ $0 = $<Sl; }$
 
 	SimpleStatements -> SimpleStatements ; SimpleStatement ${
 			{
 				struct statement **s;
-				$0 = $<1;
+				$0 = $<SSs;
 				s = &$0;
 				while (*s)
 					s = &(*s)->next;
-				*s = $<3;
+				*s = $<SS;
 			}
 			}$
 		| SimpleStatement ${ $0 = $<1; }$
@@ -176,40 +181,29 @@ $*statement
 			$0->expr->op = $2.txt;
 			$0->expr->right = $<3;
 			}$
-	Statement -> SimpleStatements NEWLINE ${
-			$0 = $<1;
-			}$
+	SSline -> SimpleStatements NEWLINE ${ $0 = $<1; }$
+	Statement -> SSline ${ $0 = $<1; }$
 		| IfStatement ${ $0 = $<1; }$
 		| Statement NEWLINE ${ $0 = $<1; }$
 
-	IfStatement -> if Expression Block OptNL ${
-				$0 = calloc(1, sizeof(struct statement));
-				$0->expr = $<2;
-				$0->thenpart = $<3;
-				}$
-		| if Expression : SimpleStatements ${
-				$0 = calloc(1, sizeof(struct statement));
-				$0->expr = $<2;
-				$0->thenpart = $<4;
-				}$
-		| if Expression Block OptNL else Block ${
-				$0 = calloc(1, sizeof(struct statement));
-				$0->expr = $<2;
-				$0->thenpart = $<3;
-				$0->elsepart = $<6;
-				}$
-		| if Expression Block OptNL else : SimpleStatements ${
-				$0 = calloc(1, sizeof(struct statement));
-				$0->expr = $<2;
-				$0->thenpart = $<3;
-				$0->elsepart = $<7;
-				}$
-		| if Expression Block OptNL else IfStatement ${
+	$RIGHT else
+
+	IfHead -> if Expression Block ${
 				$0 = calloc(1, sizeof(struct statement));
 				$0->expr = $<2;
 				$0->thenpart = $<3;
-				$0->elsepart = $<6;
 				}$
+		| IfHead NEWLINE ${ $0 = $<1; }$
+
+	IfStatement -> IfHead $$else ${ $0 = $<1; }$
+		| IfHead else Block ${
+			$0 = $<1;
+			$0->elsepart = $<3;
+			}$
+		| IfHead else IfStatement ${
+			$0 = $<1;
+			$0->elsepart = $<3;
+			}$
 
 $*expression
 	Expression -> Expression + Term ${
@@ -266,11 +260,27 @@ $*expression
 	 else if cond2:
 		there1 =x
 		there1a=x
+	if cond + cond2 :
+		hello = x;
+		hello2 = x;
+
+		sum = val +
+		 val;
+
+		if condX:
+		 foo = x *
+                    x +
+                    y
+                    / two;
+	else if cond2:
+		there1 =x
+		there1a=x
 	there2=x
 	there3=x;
 	all = y;
 	if true {yes=x;} else : no=x
 	if true: yes = no; no = yes;
+	if false: yes=ok; else: no=ok
 
 	if false {
 		print = OK
@@ -281,5 +291,56 @@ $*expression
 	if a:
 		if b:
 			c= d
+		else:
+			f=g
 	x = y
 
+# File: itest.out
+	(hello=yes);
+	(mister=no);
+	(there=x);
+	(all=y);
+	if (cond+cond2):
+	    (hello=x);
+	    (hello2=x);
+	    (sum=(val+val));
+	    if condX:
+	        (foo=((x*x)+(y/two)));
+	else:
+	    if cond2:
+	        (there1=x);
+	        (there1a=x);
+	if (cond+cond2):
+	    (hello=x);
+	    (hello2=x);
+	    (sum=(val+val));
+	    if condX:
+	        (foo=((x*x)+(y/two)));
+	else:
+	    if cond2:
+	        (there1=x);
+	        (there1a=x);
+	(there2=x);
+	(there3=x);
+	(all=y);
+	if true:
+	    (yes=x);
+	else:
+	    (no=x);
+	if true:
+	    (yes=no);
+	    (no=yes);
+	if false:
+	    (yes=ok);
+	else:
+	    (no=ok);
+	if false:
+	    (print=OK);
+	else:
+	    (print=not_OK);
+	if a:
+	    if b:
+	        (c=d);
+	    else:
+	        (f=g);
+	(x=y);