Changeset 4426 for trunk/compiler

Timestamp:

08/14/08 14:29:49 (5 months ago)

Author:

pmoura

Message:

Corrected a set of singleton variable bugs in the Logtalk compiler and runtime. Thanks to Joachim Schimpf and Kish Shen work on the improved singleton variable checking code found on the new ECLiPSe 6.0 compiler.

Files:

• trunk/compiler/logtalk.pl (modified) (2 diffs)

trunk/compiler/logtalk.pl

@@ -13179 +13179 @@
         (   var(Flag) ->
             thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, success, DetId))
-        ;   true
+        ;   % Goal generated an exception, which was already reported
+            true
         )
     ;   thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, failure, DetId))
@@ -13196 +13197 @@
     thread_send_message(Return, '$lgt_ready'(Goal, This, Self, call(Tag))),
     (   catch(Goal, Error, (thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, Error, NonDetId)), Flag = error)),
-        var(Flag),
-        thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, success, NonDetId)),
-        thread_get_message(Message),
-        (   Message == '$lgt_next' ->
-            fail    % backtrack to the catch(Goal, ...) to try to find an alternative solution
-        ;   true    % otherwise assume Message = '$lgt_exit' and terminate thread
+        (   var(Flag) ->
+            thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, success, NonDetId)),
+            thread_get_message(Message),
+            (   Message == '$lgt_next' ->
+                fail    % backtrack to the catch(Goal, ...) to try to find an alternative solution
+            ;   true    % otherwise assume Message = '$lgt_exit' and terminate thread
+            )
+        ;   % Goal generated an exception, which was already reported
+            true
         )
-    ;   nonvar(Flag),
-        !,
-        true
     ;   thread_send_message(Return, '$lgt_reply'(Goal, This, Self, Tag, failure, NonDetId))
     ).