lib/cel/environment.rb in cel-0.1.2 vs lib/cel/environment.rb in cel-0.2.0

@@ -12,37 +12,50 @@
       ast = @parser.parse(expr)
       @checker.check(ast)
       ast
     end
 
+    def encode(expr)
+      Encoder.encode(compile(expr))
+    end
+
+    def decode(encoded_expr)
+      ast = Encoder.decode(encoded_expr)
+      @checker.check(ast)
+      ast
+    end
+
     def check(expr)
       ast = @parser.parse(expr)
       @checker.check(ast)
     end
 
     def program(expr)
-      expr = compile(expr) if expr.is_a?(::String)
-      Runner.new(expr)
+      expr = @parser.parse(expr) if expr.is_a?(::String)
+      @checker.check(expr)
+      Runner.new(@declarations, expr)
     end
 
     def evaluate(expr, bindings = nil)
-      context = Context.new(bindings)
-      expr = compile(expr) if expr.is_a?(::String)
+      context = Context.new(@declarations, bindings)
+      expr = @parser.parse(expr) if expr.is_a?(::String)
+      @checker.check(expr)
       Program.new(context).evaluate(expr)
     end
 
     private
 
     def validate(ast, structs); end
   end
 
   class Runner
-    def initialize(ast)
+    def initialize(declarations, ast)
+      @declarations = declarations
       @ast = ast
     end
 
     def evaluate(bindings = nil)
-      context = Context.new(bindings)
+      context = Context.new(@declarations, bindings)
       Program.new(context).evaluate(@ast)
     end
   end
 end