quoted attribute values

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@704 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Nov 9, 2009 · 385df7e · 385df7e
1 parent 46b21dc
commit 385df7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/topics/exercises/xml2/Makefile b/topics/exercises/xml2/Makefile
@@ -2,6 +2,7 @@ test:
 	swipl -f RunParser.pro -t "main('input.txt')"
 
 fail:
+	cat bad.txt
 	swipl -f RunParser.pro -t "main('bad.txt')"
 
 debug:

diff --git a/topics/exercises/xml2/Parser.pro b/topics/exercises/xml2/Parser.pro
@@ -56,11 +56,10 @@ letters([H|T]) --> letter(H), letters(T).
 letters([]) --> [].
 letter(H,[H|T],T) :- H >= 0'a, H =< 0'z.
 
-value(V) -->
- char(H), chars(T),
- { atom_codes(V,[H|T]) }.
+value(Y)-->
+ string("'"),
+ string(V),
+ {\+member(39,V)},
+ {string_to_list(Y,V)},
+ string("'").
 
-chars([H|T]) --> char(H), chars(T).
-chars([]) --> [].
-char(H,[H|T],T) :- H >= 0'a, H =< 0'z.
-char(H,[H|T],T) :- H >= 0'0, H =< 0'9.
diff --git a/topics/exercises/xml2/bad.txt b/topics/exercises/xml2/bad.txt
@@ -1,4 +1,3 @@
-<a x=4 x=5>
+<a x='4' x='5'>
 	<b></b>
-	<c y=true></c>
 </a>
diff --git a/topics/exercises/xml2/input.txt b/topics/exercises/xml2/input.txt
@@ -1,4 +1,4 @@
-<a x=4>
+<a x='4'>
 	<b></b>
-	<c x=2 y=true></c>
+	<c x='2' y='true'></c>
 </a>