From: William D. <wdo...@us...> - 2006-08-24 20:23:00
|
Update of /cvsroot/flexml/flexml/testbed In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22590/testbed Modified Files: Makefile Added Files: mixed-stratt-def.act mixed-stratt-def.dtd mixed-stratt-def.in mixed-stratt-def.stdout.expected Log Message: Add mixed-stratt-def test (mixed content; string-valued attributes with defaults); replace several repeated rules with a pattern rule. --- NEW FILE: mixed-stratt-def.dtd --- <!-- test mixed content elements with default string sttributes --> <!ELEMENT foo (#PCDATA|bar)*> <!ELEMENT bar (#PCDATA)> <!ATTLIST bar batt CDATA 'default value' batt2 CDATA 'second default value' batt3 CDATA 'third default value' > --- NEW FILE: mixed-stratt-def.act --- <!DOCTYPE actions SYSTEM "flexml-act.dtd"> <actions> <top><![CDATA[ #include <stdio.h> ]]></top> <start tag='bar'><![CDATA[ printf("bar batt: (%s) batt2: (%s) batt3: (%s)\n", {batt}, {batt2}, {batt3}); ]]></start> <end tag='bar'><![CDATA[ printf("bar pcdata: %s\n", {#PCDATA}); ]]></end> <end tag='foo'><![CDATA[ printf("foo pcdata: %s\n", {#PCDATA}); ]]></end> <main><![CDATA[ int main(int argc, char **argv) { int retval = yylex(); printf("retval = %d\n", retval); return retval; } ]]></main> </actions> Index: Makefile =================================================================== RCS file: /cvsroot/flexml/flexml/testbed/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 23 Aug 2006 16:18:43 -0000 1.4 +++ Makefile 24 Aug 2006 20:22:57 -0000 1.5 @@ -26,7 +26,7 @@ # Compares test.out.std[out,err] with expected values COMPARE_OUT = $(MAKEUTILS_DIR)/CompareOut.pl -CC = /usr/bin/gcc-3.3 -Wall -ansi +CC = /usr/bin/gcc-3.3 -Wall CFLAGS = -O2 -g #FLEXDEBUG = -d @@ -39,13 +39,14 @@ # test definitions -- add new tests here ##################################################### -EXES = mixed1 mixed-stratt mixed-enumatt +EXES = mixed1 mixed-enumatt mixed-stratt mixed-stratt-def INTERMEDIATES = $(EXES) $(EXES:%=%.c) $(EXES:%=%.l) UNIT_TESTS = \ test_mixed1 \ + test_mixed-enumatt \ test_mixed-stratt \ - test_mixed-enumatt + test_mixed-stratt-def test : $(UNIT_TESTS) @@ -54,33 +55,31 @@ test_mixed1_cmd = ./mixed1 < mixed1.in test_mixed1_deps = mixed1 mixed1.in -# Test mixed-stratt (mixed content + string attribute) -test_mixed-stratt_cmd = ./mixed-stratt < mixed-stratt.in -test_mixed-stratt_deps = mixed-stratt mixed-stratt.in - # Test mixed-enumatt (mixed content + enumerated attribute) test_mixed-enumatt_cmd = ./mixed-enumatt < mixed-enumatt.in test_mixed-enumatt_deps = mixed-enumatt mixed-enumatt.in -##################################################### -# test build rules -- add new build rules here -##################################################### +# Test mixed-stratt (mixed content + string attribute) +test_mixed-stratt_cmd = ./mixed-stratt < mixed-stratt.in +test_mixed-stratt_deps = mixed-stratt mixed-stratt.in +# Test mixed-stratt (mixed content + default string attribute) +test_mixed-stratt-def_cmd = ./mixed-stratt-def < mixed-stratt-def.in +test_mixed-stratt-def_deps = mixed-stratt-def mixed-stratt-def.in -mixed1: mixed1.dtd mixed1.act - $(FLEXML) -b 1000 -A -amixed1.act mixed1.dtd - $(FLEX) -s -L -t mixed1.l > mixed1.c - $(CC) $(CFLAGS) -o $@ mixed1.c +% : %.dtd %.act + $(FLEXML) -b 1000 -A -a$@.act $@.dtd + $(FLEX) -s -L -o$@.c $@.l + $(CC) $(CFLAGS) -o $@ $@.c -mixed-stratt: mixed-stratt.dtd mixed-stratt.act - $(FLEXML) -b 1000 -A -amixed-stratt.act mixed-stratt.dtd - $(FLEX) -s -L -t mixed-stratt.l > mixed-stratt.c - $(CC) $(CFLAGS) -o $@ mixed-stratt.c +############################################################## +# test build rules -- add override build rules here if needed +############################################################## -mixed-enumatt: mixed-enumatt.dtd mixed-enumatt.act - $(FLEXML) -b 1000 -A -amixed-enumatt.act mixed-enumatt.dtd - $(FLEX) -s -L -t mixed-enumatt.l > mixed-enumatt.c - $(CC) $(CFLAGS) -o $@ mixed-enumatt.c +#mixed1: mixed1.dtd mixed1.act +# $(FLEXML) -b 500 -A -amixed1.act mixed1.dtd +# $(FLEX) -s -L -o mixed1.c mixed1.l > mixed1.c +# $(CC) $(CFLAGS) -o $@ mixed1.c ##################################################### --- NEW FILE: mixed-stratt-def.stdout.expected --- bar batt: (default value) batt2: (second default value) batt3: (third default value) bar pcdata: bar data 1 bar batt: (default value) batt2: ( non-default 2) batt3: (third default value) bar pcdata: bar data 2 bar batt: (default value) batt2: (second default value) batt3: (non-default with single-quote(')) bar pcdata: bar data 3 foo pcdata: 012 cdefghijklmn retval = 0 --- NEW FILE: mixed-stratt-def.in --- <!DOCTYPE foo SYSTEM "mixed-stratt-def.dtd"> <foo>012 <bar>bar data 1</bar> <bar batt2=' non-default 2'>bar data 2</bar> <bar batt3 = "non-default with single-quote(')">bar data 3</bar> cdefghijklmn</foo> |