[gnue] r6975 - trunk/gnue-common/src/logic/adapters

[jan]

Author: jan
Date: 2005-02-07 15:20:45 -0600 (Mon, 07 Feb 2005)
New Revision: 6975

Modified:
   trunk/gnue-common/src/logic/adapters/ecmascript.py
Log:
fix exception handling (ECMAscript plugin)


Modified: trunk/gnue-common/src/logic/adapters/ecmascript.py
===================================================================
--- trunk/gnue-common/src/logic/adapters/ecmascript.py  2005-02-07 18:17:00 UTC 
(rev 6974)
+++ trunk/gnue-common/src/logic/adapters/ecmascript.py  2005-02-07 21:20:45 UTC 
(rev 6975)
@@ -32,6 +32,8 @@
 import string
 
 from gnue.common.apps import GDebug
+from gnue.common.apps import errors
+from gnue.common.logic import language
 from gnue.common.logic.adapters import Base
 from gnue.common.logic.NamespaceCore import NamespaceElement
 
@@ -112,22 +114,27 @@
     try:
       self._cx.eval_script(self._realcode)
       
-    except Exception, msg:
-      raise Base.LangIfCompileError, 'Compile failed : %s' % msg
+    except:
+      (group, name, message, detail) = errors.getException (1)
+      if group == 'system':
+           group = 'application'
+      raise language.CompileError, (group, name, message, detail)
 
 
   def execute(self, *args,**params):
     param = ""
     # TODO: find a way to pass parameter
-    #print "calling: %s(%s);" % (self._hname, args)
     try:
       #return self._cx.eval_script("x=%s(%s);" % (self._name,param))
     # call function cannot call the function itself, so just simulate it
     # by creating a shortcut function to call like its_me_function to call
       return self._cx.call_fn(self._hname, ()) #args)
 
-    except Exception, msg:
-      raise Base.LangIfRuntimeError, msg
+    except:
+      (group, name, message, detail) = errors.getException (1)
+      if group == 'system':
+          group = 'application'
+      raise language.RuntimeError, (group, name, message, detail)
 
   def rebind(self, obj, name):
     pass
@@ -161,16 +168,22 @@
     # load code into context
     try:
       self._cx.eval_script(self._realcode)
-      
-    except Exception, msg:
-      raise Base.LangIfCompileError, 'Compile failed : %s' % msg
 
+    except:
+      (group, name, message, detail) = errors.getException (1)
+      if group == 'system':
+        group = 'application'
+      raise language.CompileError, (group, name, message, detail)
 
+
   def execute(self, *args,**params):
     # TODO: check args for object instances
     try:
       retval = self._cx.call_fn(self._name, args)
       return retval[0]
 
-    except Exception, msg:
-      raise Base.LangIfRuntimeError, msg
+    except:
+      (group, name, message, detail) = errors.getException (1)
+      if group == 'system':
+        group = 'application'
+      raise language.RuntimeError, (group, name, message, detail)