finitio 0.4.1 → 0.5.0

data/lib/finitio/syntax/finitio.citrus

@@ -1,7 +1,16 @@
+require 'finitio/syntax/lexer'
+require 'finitio/syntax/literals'
+require 'finitio/syntax/types'
+require 'finitio/syntax/expressions'
+
 grammar Finitio::Syntax::Parser
+  include Finitio::Syntax::Lexer
+  include Finitio::Syntax::Literals
+  include Finitio::Syntax::Expressions
+  include Finitio::Syntax::Types
 
   rule system
-    (spacing definitions spacing type? spacing eof)
+    (spacing definitions spacing main_type? spacing eof)
     <Finitio::Syntax::System>
   end
 
@@ -10,211 +19,4 @@ grammar Finitio::Syntax::Parser
     <Finitio::Syntax::Definitions>
   end
 
-  ###################################################################### Types
-  rule type_def
-    (type_name spacing '=' spacing type)
-    <Finitio::Syntax::TypeDef>
-  end
-
-  rule type
-    union_type
-  end
-
-  # union and sub types
-
-  rule union_type
-      (sub_type ('|' sub_type)+)
-      <Finitio::Syntax::UnionType>
-    | sub_type
-  end
-
-  rule sub_type
-      (rel_type constraint_def)
-      <Finitio::Syntax::SubType>
-    | rel_type
-  end
-
-  rule constraint_def
-    ('(' spacing var_name spacing '|' spacing constraints spacing ')')
-    <Finitio::Syntax::ConstraintDef>
-  end
-
-  rule constraints
-      (named_constraint (spacing ',' spacing named_constraint)*)
-      <Finitio::Syntax::Constraints>
-    | unnamed_constraint
-  end
-
-  rule named_constraint
-    (constraint_name ':' spacing expression)
-    <Finitio::Syntax::NamedConstraint>
-  end
-
-  rule unnamed_constraint
-    (spacing expression)
-    <Finitio::Syntax::UnnamedConstraint>
-  end
-
-  # relational types
-
-  rule rel_type
-      relation_type
-    | tuple_type
-    | collection_type
-  end
-
-  rule relation_type
-    ('{{' spacing heading spacing '}}')
-    <Finitio::Syntax::RelationType>
-  end
-
-  rule tuple_type
-    ('{' spacing heading spacing '}')
-    <Finitio::Syntax::TupleType>
-  end
-
-  rule heading
-      (attribute (',' spacing attribute)*)
-      <Finitio::Syntax::Heading>
-    | spacing
-      <Finitio::Syntax::Heading>
-  end
-
-  rule attribute
-    (attribute_name spacing ':' spacing type)
-    <Finitio::Syntax::Attribute>
-  end
-
-  # collection types
-
-  rule collection_type
-      set_type
-    | seq_type
-    | term_type
-  end
-
-  rule set_type
-    ('{' type '}')
-    <Finitio::Syntax::SetType>
-  end
-
-  rule seq_type
-    ('[' type ']')
-    <Finitio::Syntax::SeqType>
-  end
-
-  # terminal forms
-
-  rule term_type
-      ad_type
-    | builtin_type
-    | any_type
-    | type_ref
-  end
-
-  # ad type
-
-  rule ad_type
-    (('.' builtin_type_name)? spacing contract (spacing ',' spacing contract)*)
-    <Finitio::Syntax::AdType>
-  end
-
-  rule contract
-    ('<' contract_name '>' spacing type spacing pair?)
-    <Finitio::Syntax::Contract>
-  end
-
-  rule pair
-      inline_pair
-    | external_pair
-  end
-
-  rule inline_pair
-    ('\\' dress:lambda_expr spacing '\\' undress:lambda_expr)
-    <Finitio::Syntax::InlinePair>
-  end
-
-  rule external_pair
-    ('.' builtin_type_name)
-    <Finitio::Syntax::ExternalPair>
-  end
-
-  # any
-
-  rule any_type
-    '.'
-    <Finitio::Syntax::AnyType>
-  end
-
-  # builtin and refs
-
-  rule builtin_type
-    ('.' builtin_type_name)
-    <Finitio::Syntax::BuiltinType>
-  end
-
-  rule type_ref
-    (type_name spacing)
-    <Finitio::Syntax::TypeRef>
-  end
-
-  # lambda and expressions
-
-  rule lambda_expr
-    ('(' spacing var_name spacing '|' spacing expression spacing ')')
-    <Finitio::Syntax::LambdaExpr>
-  end
-
-  rule expression
-    (
-        ('(' spacing expression spacing ')')
-      | (![\(,\)] .)+ expression?
-    )
-    <Finitio::Syntax::Expression>
-  end
-
-  # LEXER (names)
-
-  rule var_name
-    /[a-z]+/
-  end
-
-  rule contract_name
-    /[a-z][a-z0-9]*/
-  end
-
-  rule constraint_name
-    /[a-z][a-zA-Z_]*/
-  end
-
-  rule attribute_name
-    /[a-z][a-zA-Z0-9_]*/
-  end
-
-  rule type_name
-    /[A-Z][a-zA-Z]+/
-  end
-
-  rule builtin_type_name
-    /[a-zA-Z0-9:]+/
-  end
-
-  # LEXER (spacing & comments)
-
-  rule spacing
-    (spaces | comment)*
-  end
-
-  rule comment
-    '#' (![\n] .)* [\n]?
-  end
-
-  rule spaces
-    /[ \t\n]+/
-  end
-
-  rule eof
-    !.
-  end
-
 end

data/lib/finitio/syntax/finitio.sexp

@@ -15,6 +15,7 @@ type:
   - union_type
   - set_type
   - seq_type
+  - struct_type
   - tuple_type
   - relation_type
   - ad_type
@@ -38,6 +39,9 @@ set_type:
 seq_type:
   - [ type ]
 
+struct_type:
+  - [ type+ ]
+
 tuple_type:
   - [ heading ]
 
@@ -56,7 +60,7 @@ heading:
   [ attribute+ ]
 
 attribute:
-  [ attribute_name, type ]
+  [ attribute_name, type, Boolean ]
 
 ### constraints
 

data/lib/finitio/syntax/lexer.citrus

@@ -0,0 +1,91 @@
+grammar Finitio::Syntax::Lexer
+
+  # LEXER (keywords)
+
+  rule keyword
+    'and' | 'or' | 'not' | 'true' | 'false'
+  end
+
+  # LEXER (names)
+
+  rule var_name
+    /[a-z]+/
+  end
+
+  rule contract_name
+    /[a-z][a-z0-9]*/
+  end
+
+  rule constraint_name
+    /[a-z][a-zA-Z_]*/
+  end
+
+  rule attribute_name
+    /[a-z_][a-zA-Z0-9_]*/
+  end
+
+  rule type_name
+    /[A-Z][a-zA-Z]+(\.[A-Z][a-zA-Z]+)*/
+  end
+
+  rule builtin_type_name
+    /[a-zA-Z0-9:]+/
+  end
+
+  # LEXER symbols
+
+  rule equal
+    spacing '=' spacing
+  end
+
+  rule dots
+    spacing '...' spacing
+  end
+
+  rule opt_comma
+    spacing ',' spacing | spacing
+  end
+
+  rule comma
+    spacing ',' spacing
+  end
+
+  rule pipe
+    spacing '|' spacing
+  end
+
+  rule colon
+    spacing ':' spacing
+  end
+
+  rule open_metadata
+    spacing '/-' spacing
+  end
+
+  rule close_metadata
+    spacing '-/' spacing
+  end
+
+  # LEXER (spacing & comments)
+
+  rule spacing
+    (spaces | comment)*
+  end
+
+  rule comment
+    '#' (![\n] .)* [\n]?
+  end
+
+  rule spaces
+    space+
+  end
+
+  rule space
+    [ \t\n]
+  end
+
+  rule eof
+    !.
+  end
+
+end

data/lib/finitio/syntax/literal.rb

@@ -0,0 +1,16 @@
+module Finitio
+  module Syntax
+    module Literal
+      include Node
+
+      def to_ruby
+        to_str.strip
+      end
+
+    end # module Literal
+  end # module Syntax
+end # module Finitio
+require_relative 'literal/boolean'
+require_relative 'literal/integer'
+require_relative 'literal/real'
+require_relative 'literal/string'

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

@@ -0,0 +1,22 @@
+module Finitio
+  module Syntax
+    module Literal
+      module Boolean
+        include Literal
+
+        TRUE  = "true".freeze
+        FALSE = "false".freeze
+
+        def value
+          case to_str.strip
+          when TRUE  then true
+          when FALSE then false
+          else
+            raise "Unexpected boolean literal `#{to_str}`"
+          end
+        end
+
+      end # module Boolean
+    end # module Literal
+  end # module Syntax
+end # module Finitio

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

@@ -0,0 +1,14 @@
+module Finitio
+  module Syntax
+    module Literal
+      module Integer
+        include Literal
+
+        def value
+          ::Kernel.Integer(to_str)
+        end
+
+      end # module Integer
+    end # module Literal
+  end # module Syntax
+end # module Finitio

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

@@ -0,0 +1,14 @@
+module Finitio
+  module Syntax
+    module Literal
+      module Real
+        include Literal
+
+        def value
+          ::Kernel.Float(to_str)
+        end
+
+      end # module Real
+    end # module Literal
+  end # module Syntax
+end # module Finitio

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

@@ -0,0 +1,14 @@
+module Finitio
+  module Syntax
+    module Literal
+      module String
+        include Literal
+
+        def value
+          to_str[1...-1].gsub(/\\"/, '"')
+        end
+
+      end # module String
+    end # module Literal
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/literals.citrus

@@ -0,0 +1,44 @@
+require 'finitio/syntax/lexer'
+
+grammar Finitio::Syntax::Literals
+  include Finitio::Syntax::Lexer
+
+  rule literal
+      seq_literal
+    | scalar_literal
+  end
+
+  rule seq_literal
+    ('{' spacing literal? (comma literal)* spacing '}') {
+      captures[:literal].map(&:value)
+    }
+  end
+
+  rule scalar_literal
+      boolean_literal
+    | real_literal
+    | integer_literal
+    | string_literal
+  end
+
+  rule boolean_literal
+    ("true" | "false")
+    <Finitio::Syntax::Literal::Boolean>
+  end
+
+  rule integer_literal
+    ([0] | [1-9] [0-9]*)
+    <Finitio::Syntax::Literal::Integer>
+  end
+
+  rule real_literal
+    (integer_literal? '.' [0-9]*)
+    <Finitio::Syntax::Literal::Real>
+  end
+
+  rule string_literal
+    (["] str:([\\]["] | !["] .)* ["])
+    <Finitio::Syntax::Literal::String>
+  end
+
+end