Changeset 4468 for trunk/compiler

Timestamp:

09/11/08 16:43:05 (4 months ago)

Author:

pmoura

Message:

Corrected a bug in the Logtalk compiler that would result in failure to restore the operator table in case of compilation error.

Files:

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

trunk/compiler/logtalk.pl

@@ -4707 +4707 @@
 '$lgt_compiler_error_handler'(Input, Output, Error) :-
     '$lgt_report_compiler_error'(Input, Error),
+    '$lgt_restore_global_op_table',
     '$lgt_clean_pp_clauses',
-    '$lgt_restore_global_op_table',
     '$lgt_reset_warnings_counter',
     catch(close(Input), _, true),
@@ -4723 +4723 @@
 '$lgt_compiler_error_handler'(Stream, Error) :-
     '$lgt_report_compiler_error'(Stream, Error),
+    '$lgt_restore_global_op_table',
     '$lgt_clean_pp_clauses',
-    '$lgt_restore_global_op_table',
     '$lgt_reset_warnings_counter',
     catch(close(Stream), _, true),
@@ -4738 +4738 @@
     ('$lgt_pp_entity'(_, _, _, _, _) -> nl; true),
     write('        ERROR!    '), writeq(Error), nl,
+    '$lgt_restore_global_op_table',
     '$lgt_clean_pp_clauses',
-    '$lgt_restore_global_op_table',
     '$lgt_reset_warnings_counter',
     throw(Error).
@@ -4805 +4805 @@
     '$lgt_write_tr_entity'(Stream),
     '$lgt_write_entity_doc'(Entity),
-    '$lgt_restore_file_op_table',
     '$lgt_save_entity_rclauses',
     '$lgt_clean_pp_entity_clauses'.
@@ -4832 +4831 @@
     retractall('$lgt_pp_global_op_'(_, _, _)),
     retractall('$lgt_pp_file_op_'(_, _, _)),
+    retractall('$lgt_pp_entity_op_'(_, _, _)),
     retractall('$lgt_pp_file_init_'(_)),    
     retractall('$lgt_pp_entity_init_'(_, _, _)),
@@ -4895 +4895 @@
     retractall('$lgt_pp_referenced_protocol_'(_)),
     retractall('$lgt_pp_referenced_category_'(_)),
-    retractall('$lgt_pp_entity_op_'(_, _, _)),
     retractall('$lgt_pp_threaded_'),
     retractall('$lgt_pp_synchronized_').
@@ -5276 +5275 @@
 '$lgt_tr_directive'(object, [Obj| Rels], _, _) :-
     '$lgt_report_compiling_entity'(object, Obj),
+    '$lgt_save_file_op_table',
     '$lgt_tr_object_id'(Obj, static),                           % assume static object
-    '$lgt_tr_object_relations'(Rels, Obj),
-    '$lgt_save_file_op_table'.
+    '$lgt_tr_object_relations'(Rels, Obj).
 
 '$lgt_tr_directive'(end_object, [], _, Output) :-
     (   '$lgt_pp_object_'(Obj, _, _, _, _, _, _, _, _, _, _) ->
         '$lgt_tr_entity'(object, Obj, Output),
+        '$lgt_restore_file_op_table',
         '$lgt_report_compiled_entity'(object, Obj)
     ;   throw(closing_directive_mismatch)
@@ -5306 +5306 @@
 '$lgt_tr_directive'(protocol, [Ptc| Rels], _, _) :-
     '$lgt_report_compiling_entity'(protocol, Ptc),
+    '$lgt_save_file_op_table',
     '$lgt_tr_protocol_id'(Ptc, static),                         % assume static protocol
-    '$lgt_tr_protocol_relations'(Rels, Ptc),
-    '$lgt_save_file_op_table'.
+    '$lgt_tr_protocol_relations'(Rels, Ptc).
 
 '$lgt_tr_directive'(end_protocol, [], _, Output) :-
     (   '$lgt_pp_protocol_'(Ptc, _, _, _, _) ->
         '$lgt_tr_entity'(protocol, Ptc, Output),
+        '$lgt_restore_file_op_table',
         '$lgt_report_compiled_entity'(protocol, Ptc)
     ;   throw(closing_directive_mismatch)
@@ -5337 +5338 @@
 '$lgt_tr_directive'(category, [Ctg| Rels], _, _) :-
     '$lgt_report_compiling_entity'(category, Ctg),
+    '$lgt_save_file_op_table',
     '$lgt_tr_category_id'(Ctg, static),                         % assume static category
-    '$lgt_tr_category_relations'(Rels, Ctg),
-    '$lgt_save_file_op_table'.
+    '$lgt_tr_category_relations'(Rels, Ctg).
 
 '$lgt_tr_directive'(end_category, [], _, Output) :-
     (   '$lgt_pp_category_'(Ctg, _, _, _, _, _) ->
         '$lgt_tr_entity'(category, Ctg, Output),
+        '$lgt_restore_file_op_table',
         '$lgt_report_compiled_entity'(category, Ctg)
     ;   throw(closing_directive_mismatch)