Add exception InterruptParsingError to be able to interrupt file parsing (patch from...

diff --git a/Noyau/N_Exception.py b/Noyau/N_Exception.py
index 1c4b0221c0cab318948e71da210a7df44185ffa3..bf4722e345cf4b7cc624039469ff15e9a7528748 100644 (file)
--- a/Noyau/N_Exception.py
+++ b/Noyau/N_Exception.py
@@ -30,3 +30,7 @@ class AsException(Exception):
 
   def __str__(self):
     return unicode(self).encode(get_encoding())
+
+class InterruptParsingError(Exception):
+    """Exception used to interrupt the parsing of the command file
+    without raising an error (see N_JDC.exec_compile for usage)"""

diff --git a/Noyau/N_JDC.py b/Noyau/N_JDC.py
index 463738ab923e81aefbf99c17a51b145e041740a5..ba59be46a05344714dfb405f363fc000c2803218 100644 (file)
--- a/Noyau/N_JDC.py
+++ b/Noyau/N_JDC.py
@@ -30,7 +30,7 @@ import types,sys,linecache
 # Modules EFICAS
 import N_OBJECT
 import N_CR
-from N_Exception import AsException
+from N_Exception import AsException, InterruptParsingError
 from N_ASSD import ASSD
 from N_info import message, SUPERV
 from strfunc import get_encoding
@@ -213,6 +213,10 @@ Causes possibles :
          CONTEXT.unset_current_step()
          if self.appli != None : self.appli.affiche_infos('')
 
+      except InterruptParsingError:
+         # interrupt the command file parsing used by FIN to ignore the end of the file
+         pass
+
       except EOFError:
         # Exception utilise pour interrompre un jeu
         # de commandes avant la fin