allow multi-line matching

sebgod · May 20, 2015 · 38543e7 · 38543e7
1 parent f652817
commit 38543e7
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 16 deletions.
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -0,0 +1 @@
+*.res
diff --git a/tests/Makefile b/tests/Makefile
@@ -1,37 +1,38 @@
 include ../Make.options
 
-EXPS := $(wildcard internal/*.exp)
+EXPS := $(wildcard manual/*.exp)
 RESS := $(patsubst %.exp,%.res,$(EXPS))
+TEST_MODULE := test_mercury_slre
+TEST_EXE    := $(TEST_MODULE)$(EXE_EXT)
 
 .PHONY: runtests
-runtests: $(RESS)
+runtests: $(TEST_EXE) $(RESS)
 
 Mercury.modules: $(wildcard *.m) $(wildcard ../src/*.m)
 	@echo Call test clean to ensure testing of changed code
 	$(MAKE) tests.clean
 	$(MMC) -f $^
 
-test_mercury_slre: Mercury.modules $(SLRE_OBJ)
+$(TEST_EXE): Mercury.modules $(SLRE_OBJ) $(wildcard ../src/*.[chm])
 	$(MMC) $(MCFLAGS) --make $@ --link-object $(SLRE_OBJ) $(MLLIBS)
 
 $(SLRE_OBJ):
 	cd ../src && $(MAKE) $@
 	$(HARDLINK) ../src/$@ $@
 
-%.res: %.exp
-	@echo testing $*
-	$(CURL) $(CURL_FLAGS) http://127.0.0.1:$(SLRE_TEST_PORT)/$* | \
-		$(DIFF) $(DIFF_FLAGS) $< - >$*.res
+%.res: %.exp %.inp
+	@echo testing $*.inp
+	@./$(TEST_MODULE) < $*.inp | $(DIFF) $(DIFF_FLAGS) $< - >$*.res
 
 .PHONY: tests.clean
 tests.clean:
 	$(DEL_FILE) $(RESS)
 
 .PHONY: clean
 clean: tests.clean
-	$(MMC) --make test_mercury_slre.clean
+	$(MMC) --make $(TEST_MODULE).clean
 	$(DEL_DIR) Mercury
 	$(DEL_FILE) Mercury.modules
 	$(DEL_FILE) FAILED_TESTS ABORTED_TESTS
 	$(DEL_FILE) $(SLRE_OBJ)
-	$(DEL_FILE) test_mercury_slre$(EXE_EXT)
+	$(DEL_FILE) $(TEST_EXE)
diff --git a/tests/manual/assert.exp b/tests/manual/assert.exp
@@ -0,0 +1 @@
+ok	x|$	abcd	NULL	0	0	4
diff --git a/tests/manual/assert.inp b/tests/manual/assert.inp
@@ -0,0 +1,2 @@
+ASSERT\(slre_match\("([^"]+)",\s*"([^"]+)",\s*\d+,\s+(NULL|caps),\s*(\d+),\s*(\d+)\)\s*==\s*(\d+|[A_Z]\s+).*
+ASSERT(slre_match("x|$", "abcd", 4, NULL, 0, 0) == 4;
diff --git a/tests/manual/digits.exp b/tests/manual/digits.exp
@@ -0,0 +1 @@
+ok
diff --git a/tests/manual/digits.inp b/tests/manual/digits.inp
@@ -0,0 +1,2 @@
+\d+
+123
diff --git a/tests/manual/not_match_empty.exp b/tests/manual/not_match_empty.exp
diff --git a/tests/manual/not_match_empty.inp b/tests/manual/not_match_empty.inp
@@ -0,0 +1 @@
+^\s+$
diff --git a/tests/test_mercury_slre.m b/tests/test_mercury_slre.m
@@ -27,22 +27,49 @@
 
 :- import_module mercury_slre.
 
-:- import_module bool.
 :- import_module int.
 :- import_module list.
-:- import_module maybe.
 :- import_module string.
 
 %----------------------------------------------------------------------------%
 
 main(!IO) :-
-    ( if matches("^(\\d+)$", "123", match(Captures, _)) then
-        print_line("ok", !IO),
-        foldl(print_line, Captures, !IO)
-    else
-        print_line("no match", !IO)
+    io.read_line_as_string(RegExRes, !IO),
+    ( RegExRes = ok(RegEx),
+        match_lines(RegEx, !IO)
+    ; RegExRes = error(Error : io.error),
+        print_line(stderr_stream, error_message(Error) : string, !IO)
+    ; RegExRes = eof,
+        print_line(stderr_stream, "premature end of file", !IO)
     ).
 
+:- pred match_lines(string::in, io::di, io::uo) is det.
+
+match_lines(RegEx, !IO) :-
+    PrintWithTab = (pred(T::in, !.IO::di, !:IO::uo) is det :-
+        io.print("\t", !IO),
+        io.print(T, !IO)
+    ),
+    io.read_line_as_string(TextRes, !IO),
+    ( TextRes = ok(Text),
+        ( if
+            matches(RegEx, Text, match(Captures, ScannedCodeUnits)),
+            ScannedCodeUnits >= 0
+        then
+            print("ok", !IO),
+            foldl(PrintWithTab, Captures, !IO),
+            nl(!IO)
+        else
+            true
+        ),
+        match_lines(RegEx, !IO)
+    ; TextRes = error(Error : io.error),
+        print_line(stderr_stream, error_message(Error) : string, !IO)
+    ; TextRes = eof,
+        true
+    ).
+
+
 %----------------------------------------------------------------------------%
 :- end_module test_mercury_slre.
 %----------------------------------------------------------------------------%