finitio 0.4.1 → 0.5.0

data/lib/finitio/syntax.rb

@@ -1,32 +1,14 @@
 require 'citrus'
-require_relative 'syntax/support'
-require_relative 'syntax/system'
-require_relative 'syntax/definitions'
-require_relative 'syntax/type_def'
-require_relative 'syntax/expression'
-require_relative 'syntax/attribute'
-require_relative 'syntax/heading'
-require_relative 'syntax/any_type'
-require_relative 'syntax/builtin_type'
-require_relative 'syntax/sub_type'
-require_relative 'syntax/constraint_def'
-require_relative 'syntax/constraints'
-require_relative 'syntax/named_constraint'
-require_relative 'syntax/unnamed_constraint'
-require_relative 'syntax/seq_type'
-require_relative 'syntax/set_type'
-require_relative 'syntax/tuple_type'
-require_relative 'syntax/relation_type'
-require_relative 'syntax/union_type'
-require_relative 'syntax/type_ref'
-require_relative 'syntax/ad_type'
-require_relative 'syntax/contract'
-require_relative 'syntax/inline_pair'
-require_relative 'syntax/external_pair'
-require_relative 'syntax/lambda_expr'
+require_relative 'syntax/node'
+require_relative 'syntax/literal'
+require_relative 'syntax/expr'
+require_relative 'syntax/type'
 module Finitio
   module Syntax
 
+    Citrus.load File.expand_path('../syntax/lexer.citrus', __FILE__)
+    Citrus.load File.expand_path('../syntax/literals.citrus', __FILE__)
+    Citrus.load File.expand_path('../syntax/expressions.citrus', __FILE__)
     Citrus.load File.expand_path('../syntax/finitio.citrus', __FILE__)
 
     def self.parse(source, *args, &bl)
@@ -38,13 +20,16 @@ module Finitio
       parse(source, root: "system").to_ast
     end
 
-    def self.compile(source, system = Finitio::System.new)
-      parse(source, root: "system").compile(system)
+    def self.compile(source, cpl = nil)
+      cpl = Compilation.coerce(cpl)
+      parse(source, root: "system").compile(cpl)
+      cpl.resolve_proxies!.system
     end
 
-    def self.compile_type(source)
-      parse(source, root: "type").compile(TypeFactory.new)
+    def self.compile_type(source, cpl = nil)
+      cpl = Compilation.coerce(cpl)
+      parse(source, root: "type").compile(cpl)
     end
 
-  end
-end
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr.rb

@@ -0,0 +1,56 @@
+module Finitio
+  module Syntax
+    module Expr
+      include Node
+
+      WORLD_VAR = "__world"
+
+      def self.included(by)
+        by.extend(Node::ClassHelpers)
+      end
+
+      def to_proc()
+        src = to_proc_src
+        ::Kernel.eval(src)
+      end
+
+      def to_proc_src
+        initializer = free_variables
+          .map{|v| "#{v} = __world.fetch(:#{v})" }
+          .join("\n")
+        <<-SRC.gsub(/^[ ]{10}/m,'')
+          ->(__world){
+            unless __world.is_a?(Hash) && __world.keys.all?{|k| k.is_a?(Symbol) }
+              raise "Invalid world: " + __world.inspect
+            end
+            #{initializer}
+            #{to_proc_source}
+          }
+        SRC
+      end
+
+      def to_proc_source
+        raise NotImplementedError
+      end
+
+      def free_variables
+        [].tap{|fvs| _free_variables(fvs) }.uniq
+      end
+
+      def _free_variables(fvs)
+        raise NotImplementedError
+      end
+
+    end # module Expr
+  end # module Syntax
+end # module Finitio
+require_relative 'expr/logic_dyadic'
+require_relative 'expr/logic_not'
+require_relative 'expr/comparison'
+require_relative 'expr/arith_op'
+require_relative 'expr/unary_minus_op'
+require_relative 'expr/oo_call'
+require_relative 'expr/fn_call'
+require_relative 'expr/identifier'
+require_relative 'expr/literal'
+require_relative 'expr/parenthesized'

data/lib/finitio/syntax/expr/arith_op.rb

@@ -0,0 +1,22 @@
+module Finitio
+  module Syntax
+    module Expr
+      module ArithOp
+        include Expr
+
+        capture :left, :op, :right
+
+        def to_proc_source
+          l, r = left.to_proc_source, right.to_proc_source
+          "#{l}.#{op.to_str.strip}(#{r})"
+        end
+
+        def _free_variables(fvs)
+          left._free_variables(fvs)
+          right._free_variables(fvs)
+        end
+
+      end # module ArithOp
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/comparison.rb

@@ -0,0 +1,22 @@
+module Finitio
+  module Syntax
+    module Expr
+      module Comparison
+        include Expr
+
+        capture :left, :op, :right
+
+        def to_proc_source
+          l, r = left.to_proc_source, right.to_proc_source
+          "#{l}.#{op.to_str.strip}(#{r})"
+        end
+
+        def _free_variables(fvs)
+          left._free_variables(fvs)
+          right._free_variables(fvs)
+        end
+
+      end # module Comparison
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/fn_call.rb

@@ -0,0 +1,24 @@
+module Finitio
+  module Syntax
+    module Expr
+      module FnCall
+        include Expr
+
+        capture :fn
+
+        def to_proc_source
+          args = captures[:expr].map(&:to_proc_source)
+          first, rest = args.first, args[1..-1]
+          "#{first}.#{fn}(#{rest.join(',')})"
+        end
+
+        def _free_variables(fvs)
+          captures[:expr].each do |e|
+            e._free_variables(fvs)
+          end
+        end
+
+      end # module FnCall
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/identifier.rb

@@ -0,0 +1,18 @@
+module Finitio
+  module Syntax
+    module Expr
+      module Identifier
+        include Expr
+
+        def to_proc_source(free = true)
+          self.to_str
+        end
+
+        def _free_variables(fvs)
+          fvs << self.to_str
+        end
+
+      end # module Identifier
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/literal.rb

@@ -0,0 +1,19 @@
+module Finitio
+  module Syntax
+    module Expr
+      module Literal
+        include Expr
+
+        capture :literal
+
+        def to_proc_source
+          literal.to_ruby
+        end
+
+        def _free_variables(fvs)
+        end
+
+      end # module Identifier
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/logic_dyadic.rb

@@ -0,0 +1,22 @@
+module Finitio
+  module Syntax
+    module Expr
+      module LogicDyadic
+        include Expr
+
+        capture :left, :op, :right
+
+        def to_proc_source
+          l, r = left.to_proc_source, right.to_proc_source
+          "(#{l} #{op} #{r})"
+        end
+
+        def _free_variables(fvs)
+          left._free_variables(fvs)
+          right._free_variables(fvs)
+        end
+
+      end # module LogicDyadic
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/logic_not.rb

@@ -0,0 +1,21 @@
+module Finitio
+  module Syntax
+    module Expr
+      module LogicNot
+        include Expr
+
+        capture :term
+
+        def to_proc_source
+          l = term.to_proc_source
+          "!(#{l})"
+        end
+
+        def _free_variables(fvs)
+          term._free_variables(fvs)
+        end
+
+      end # module LogicNot
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/oo_call.rb

@@ -0,0 +1,24 @@
+module Finitio
+  module Syntax
+    module Expr
+      module OOCall
+        include Expr
+
+        capture :left
+
+        def to_proc_source
+          l = left.to_proc_source
+          r = captures[:right]
+          .map{|s| "fetch(:#{s.to_proc_source})" }
+          .join('.')
+          "#{l}.#{r}"
+        end
+
+        def _free_variables(fvs)
+          left._free_variables(fvs)
+        end
+
+      end # module OOCall
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/parenthesized.rb

@@ -0,0 +1,20 @@
+module Finitio
+  module Syntax
+    module Expr
+      module Parenthesized
+        include Expr
+
+        capture :expr
+
+        def to_proc_source
+          expr.to_proc_source
+        end
+
+        def _free_variables(fvs)
+          expr._free_variables(fvs)
+        end
+
+      end # module Parenthesized
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expr/unary_minus_op.rb

@@ -0,0 +1,21 @@
+module Finitio
+  module Syntax
+    module Expr
+      module UnaryMinusOp
+        include Expr
+
+        capture :term
+
+        def to_proc_source
+          r = term.to_proc_source
+          "-#{r}"
+        end
+
+        def _free_variables(fvs)
+          term._free_variables(fvs)
+        end
+
+      end # module UnaryMinusOp
+    end # module Expr
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/expressions.citrus

@@ -0,0 +1,129 @@
+require 'finitio/syntax/lexer'
+require 'finitio/syntax/literals'
+
+grammar Finitio::Syntax::Expressions
+  include Finitio::Syntax::Lexer
+  include Finitio::Syntax::Literals
+
+  rule expr
+    logic_or_expr
+  end
+
+  ### Boolean logic
+
+  rule logic_or_expr
+      (left:logic_and_expr op:or_operator right:logic_or_expr)
+      <Finitio::Syntax::Expr::LogicDyadic>
+    | logic_and_expr
+  end
+
+  rule or_operator
+    spaces? ('or' | '||') spaces?
+  end
+
+  rule logic_and_expr
+      (left:logic_not_expr op:and_operator right:logic_and_expr)
+      <Finitio::Syntax::Expr::LogicDyadic>
+    | logic_not_expr
+  end
+
+  rule and_operator
+    spaces? ('and' | '&&') spaces?
+  end
+
+  rule logic_not_expr
+      (not_operator term:logic_term)
+      <Finitio::Syntax::Expr::LogicNot>
+    | logic_term
+  end
+
+  rule not_operator
+    spaces? ('!' | 'not') spaces?
+  end
+
+  rule logic_term
+    comparison_expr
+  end
+
+  ### Comparisons
+
+  rule comparison_expr
+      (left:arith_expr op:comparison_operator right:comparison_expr)
+      <Finitio::Syntax::Expr::Comparison>
+    | arith_expr
+  end
+
+  rule comparison_operator
+    spaces? ('==' | '!=' | '<=' | '>=' | '<' | '>' | '=~') spaces?
+  end
+
+  ### Arithmetic
+
+  rule arith_expr
+    arith_plusminus_expr
+  end
+
+  rule arith_plusminus_expr
+      (left:arith_multdiv_expr op:plusminus_operator right:arith_plusminus_expr)
+      <Finitio::Syntax::Expr::ArithOp>
+    | arith_multdiv_expr
+  end
+
+  rule plusminus_operator
+    spaces? ('+' | '-') spaces?
+  end
+
+  rule arith_multdiv_expr
+      (left:arith_term_expr op:multdiv_operator right:arith_multdiv_expr)
+      <Finitio::Syntax::Expr::ArithOp>
+    | arith_term_expr
+  end
+
+  rule multdiv_operator
+    spaces? ('*' | '/') spaces?
+  end
+
+  rule arith_term_expr
+      ('-' term:arith_term_expr)
+      <Finitio::Syntax::Expr::UnaryMinusOp>
+    | oo_call
+  end
+
+  ### Function calls
+
+  rule oo_call
+      (left:fn_call ('.' right:identifier_expr)+)
+      <Finitio::Syntax::Expr::OOCall>
+    | fn_call
+  end
+
+  rule fn_call
+      (fn:term_expr '(' spaces? expr? (comma expr)* spaces? ')')
+      <Finitio::Syntax::Expr::FnCall>
+    | term_expr
+  end
+
+  ###
+
+  rule term_expr
+      identifier_expr
+    | literal_expr
+    | parenthesized_expr
+  end
+
+  rule identifier_expr
+    (!keyword /[a-zA-Z_][a-zA-Z0-9_]*/)
+    <Finitio::Syntax::Expr::Identifier>
+  end
+
+  rule literal_expr
+    (!eof literal)
+    <Finitio::Syntax::Expr::Literal>
+  end
+
+  rule parenthesized_expr
+    ('(' spaces? expr spaces? ')')
+    <Finitio::Syntax::Expr::Parenthesized>
+  end
+
+end