goodguide-gibbon 0.2.0 → 0.2.1

data/lib/goodguide/gibbon.rb

@@ -25,23 +25,32 @@ module GoodGuide
     class RuntimeError < StandardError; end
 
     class Program
-      attr_reader :source
-      def initialize(global, context, source)
-        @global = global
-        @context = context
-        @source = source
+      def self.parse(context, global, source)
+        syntax = context.parse(source)
+        semantics, errors = context.analyze(syntax, global)
+        raise SemanticError.new(errors) if errors
+
+        Program.new(context,
+          :global => global,
+          :syntax => syntax,
+          :semantics => semantics,
+        )
       end
 
-      def syntax
-        @syntax ||= @context.parse(@source)
+      attr_reader :syntax, :semantics
+      def initialize(context, info={})
+        @context = context
+        @global = info[:global]
+        @syntax = info[:syntax]
+        @semantics = info[:semantics]
       end
 
-      def semantics
-        @semantics ||= begin
-          semantics, errors = @context.analyze(self.syntax, @global)
-          raise SemanticError.new(errors) if errors
-          semantics
-        end
+      def as_json
+        {
+          global: @global,
+          syntax: @syntax,
+          semantics: @semantics,
+        }
       end
 
       def call(entity_id)
@@ -55,16 +64,12 @@ module GoodGuide
     end
 
     class Client
-      def self.parse(global, source)
-        self.new.parse(global, source)
-      end
-
-      def parse(global, source)
-        Program.new(global, context, source)
+      def self.make_context
+        new.make_context
       end
 
-      def context
-        @context ||= Context.new(self)
+      def make_context
+        Context.new(self)
       end
 
       def lookup_type(id, name)

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.2.0'
+      '0.2.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime