Changeset 6514

Timestamp:

02/22/12 06:38:11 (3 months ago)

Author:

pmoura

Message:

Allow open lists of terminals in the body of grammar rules.

Location:

trunk

Files:

• RELEASE_NOTES.txt (modified) (1 diff)
• compiler/logtalk.pl (modified) (2 diffs)

trunk/RELEASE_NOTES.txt

@@ -15 +15 @@
 
 2.43.4 - March ??, 2012
+
+    Allow open lists of terminals in the body of grammar rules.
 
     Added an example of combining constraints defined in different objects

trunk/compiler/logtalk.pl

@@ -2053 +2053 @@
     '$lgt_prolog_feature'(Flag, Value).
 
-current_logtalk_flag(version, version(2, 43, 3)).
+current_logtalk_flag(version, version(2, 43, 4)).
 
 
@@ -16574 +16574 @@
 % translates a list of terminals:
 
-'$lgt_dcg_terminals'(Terminals, S0, S, S0 = List) :-
-    '$lgt_must_be'(list, Terminals),
-    '$lgt_append'(Terminals, S, List).
+'$lgt_dcg_terminals'(Terminals, S0, S, Goal) :-
+    '$lgt_must_be'(nonvar, Terminals),
+    (   '$lgt_is_list'(Terminals) ->
+        '$lgt_append'(Terminals, S, List),
+        Goal = (S0 = List)
+    ;   '$lgt_must_be'(list_or_partial_list, Terminals),
+        Goal = {'$lgt_append'(Terminals, S, S0)}
+    ).