expressionmap.rb in openwferu-0.9.9

- old
+ new

@@ -58,10 +58,13 @@
 require 'openwfe/expressions/fe_cursor'
 require 'openwfe/expressions/fe_iterator'
 require 'openwfe/expressions/fe_fqv'
 require 'openwfe/expressions/fe_cancel'
 require 'openwfe/expressions/fe_do'
+require 'openwfe/expressions/fe_save'
+require 'openwfe/expressions/fe_filter_definition'
+require 'openwfe/expressions/fe_filter'
 
 
 module OpenWFE
 
     #
@@ -82,10 +85,12 @@
             register ParticipantExpression
 
             register ConcurrenceExpression
             register GenericSyncExpression
 
+            register ConcurrentIteratorExpression
+
             register SubProcessRefExpression
 
             register SetValueExpression
             register UnsetValueExpression
 
@@ -121,10 +126,16 @@
             register CancelProcessExpression
 
             register UndoExpression
             register RedoExpression
 
+            register SaveWorkItemExpression
+            register RestoreWorkItemExpression
+
+            register FilterDefinitionExpression
+            register FilterExpression
+
             register Environment
                 #
                 # only used by get_expression_names()
         end
 
@@ -132,10 +143,13 @@
         # Returns the expression class corresponding to the given 
         # expression name
         #
         def get_class (expression_name)
 
+            expression_name = expression_name.expression_name \
+                if expression_name.kind_of?(RawExpression)
+
             expression_name = OpenWFE::symbol_to_name(expression_name)
 
             @expressions[expression_name]
         end
 
@@ -150,10 +164,11 @@
         #
         def is_definition? (expression_name)
 
             c = get_class(expression_name)
 
-            c == DefineExpression
+            #c == DefineExpression
+            (c and c.is_definition?)
         end
 
         #
         # Returns an array of expression names whose class are assignable
         # from the given expression_class.