Changeset 4518 for trunk/compiler

Timestamp:

10/19/08 03:04:21 (3 months ago)

Author:

pmoura

Message:

Added the new entity properties file/2 and lines/2 to the list of valid entity properties used for error checking. Corrected a bug in the object_property/2, protocol_property/2, and category_property/2 built-in predicates when accessing the new internal entity property table.

Files:

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

trunk/compiler/logtalk.pl

@@ -479 +479 @@
 object_property(logtalk, built_in).
 
-object_property(Obj, Prop) :-               % static/dynamic property
-    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, Prop).
-
 object_property(Obj, Prop) :-
-    '$lgt_entity_property_'(Obj, Prop).
+    '$lgt_current_object_'(Obj, _, _, _, _, _, _, _, _, _, Type),
+    (   Prop = Type                         % static/dynamic property
+    ;   '$lgt_entity_property_'(Obj, Prop)  % other properties
+    ).
 
 
@@ -499 +499 @@
     throw(error(domain_error(category_property, Prop), category_property(Ctg, Prop))).
 
-category_property(Ctg, Prop) :-             % static/dynamic property
-    '$lgt_current_category_'(Ctg, _, _, _, _, Prop).
-
 category_property(Ctg, Prop) :-
-    '$lgt_entity_property_'(Ctg, Prop).
+    '$lgt_current_category_'(Ctg, _, _, _, _, Type),
+    (   Prop = Type                         % static/dynamic property
+    ;   '$lgt_entity_property_'(Ctg, Prop)  % other properties
+    ).
 
 
@@ -519 +519 @@
     throw(error(domain_error(protocol_property, Prop), protocol_property(Ptc, Prop))).
 
-protocol_property(Ptc, Prop) :-             % static/dynamic property
-    '$lgt_current_protocol_'(Ptc, _, _, _, Prop).
-
 protocol_property(Ptc, Prop) :-
-    '$lgt_entity_property_'(Ptc, Prop).
+    '$lgt_current_protocol_'(Ptc, _, _, _, _, Type),
+    (   Prop = Type                         % static/dynamic property
+    ;   '$lgt_entity_property_'(Ptc, Prop)  % other properties
+    ).
 
 
@@ -11636 +11636 @@
 '$lgt_valid_object_property'(synchronized).
 '$lgt_valid_object_property'(threaded).
+'$lgt_valid_object_property'(file(_, _)).
+'$lgt_valid_object_property'(lines(_, _)).
 
 
@@ -11644 +11646 @@
 '$lgt_valid_protocol_property'((dynamic)).
 '$lgt_valid_protocol_property'(static).
+'$lgt_valid_protocol_property'(file(_, _)).
+'$lgt_valid_protocol_property'(lines(_, _)).
 
 
@@ -11653 +11657 @@
 '$lgt_valid_category_property'(static).
 '$lgt_valid_category_property'(synchronized).
+'$lgt_valid_category_property'(file(_, _)).
+'$lgt_valid_category_property'(lines(_, _)).