gisele 0.4.0 → 0.5.0

data/lib/gisele/compiling/to_graph.yml

@@ -0,0 +1,20 @@
+graphviz:
+  task_def:
+    shape: circle
+    style: filled
+    fillcolor: black
+    fixed: true
+    width: 0.1
+  task_call_st:
+    shape: box
+  while_st:
+    shape: diamond
+  if_st:
+    shape: diamond
+  case_st:
+    shape: diamond
+  par_st:
+    shape: box
+    height: 0.1
+    style: filled
+    fillcolor: black

data/lib/gisele/language.rb

@@ -1,45 +1,31 @@
+require 'yaml'
 module Gisele
-  module Language
 
-    require 'yaml'
-    DOT_ATTRIBUTES = YAML.load_file(Path.dir/"language/grammar.dot.yml")
-    SEXP_GRAMMAR   = SexpGrammar.load Path.dir/"language/grammar.sexp.yml"
+  # Load the Language through Sexpr
+  Language = Sexpr.load Path.dir/"language/grammar.sexp.yml"
+
+  # Load syntax nodes, abstract syntax nodes, and processors
+  require_relative 'language/syntax/node'
+  require_relative 'language/ast/node'
+  require_relative 'language/processors'
 
-    RESERVED_WORDS = [
-      "if",
-      "else",
-      "elsif",
-      "when",
-      "while",
-      "seq",
-      "par",
-      "task",
-      "refinement",
-      "fluent",
-      "trackvar",
-      "initially",
-      "end",
-      "not",
-      "or",
-      "and",
-      "true",
-      "false"
-    ]
+  # Force loading the Citrus parser now
+  Language.parser.parser
+
+  module Language
 
-    def rule2mod(rule)
-      rule.to_s.gsub(/(^|_)([a-z])/){|x| $2.capitalize}.to_sym
+    # By default, Sexpr will find for abstract nodes under Language itself. We
+    # override that behavior here and let it know that the AST module is the
+    # parent of all ast nodes.
+    def tagging_reference
+      AST
     end
-    module_function :rule2mod
 
-    def mod2rule(mod)
-      mod = mod.name.to_s.split('::').last.to_sym if mod.is_a?(Module)
-      mod.to_s.gsub(/[A-Z]/){|x| "_#{x.downcase}"}[1..-1].to_sym
+    # The tagging function (from s-expr kind to AST module) is not complete so far.
+    # This allows us to at least include the AST:Node module in all s-expressions.
+    def default_tagging_module
+      AST::Node
     end
-    module_function :mod2rule
 
   end # module Language
-end # module Gisele
-require_relative 'language/syntax'
-require_relative 'language/ast'
-require_relative 'language/rewriter'
-require_relative 'language/processors'
+end # module Gisele

data/lib/gisele/language/ast/bool_and.rb

@@ -5,7 +5,7 @@ module Gisele
         include Node
 
         def label
-          markers[:match] ? markers[:match].to_s : "(#{self[1].label} and #{self[2].label})"
+          (citrus_match && citrus_match.to_s) || "(#{self[1].label} and #{self[2].label})"
         end
 
       end # module BoolAnd

data/lib/gisele/language/ast/bool_expr.rb

@@ -5,7 +5,15 @@ module Gisele
         include Node
 
         def label
-          markers[:match] ? markers[:match].to_s : last.label
+          (citrus_match && citrus_match.to_s) || last.label
+        end
+
+        def negate
+          if last.first == :bool_not
+            Language.sexpr [:bool_expr, last.last]
+          else
+            Language.sexpr [ :bool_expr, [:bool_not, last] ]
+          end
         end
 
       end # module BoolExpr

data/lib/gisele/language/ast/bool_not.rb

@@ -5,7 +5,7 @@ module Gisele
         include Node
 
         def label
-          markers[:match] ? markers[:match].to_s : "not(#{last.label})"
+          (citrus_match && citrus_match.to_s) || "not(#{last.label})"
         end
 
       end # module BoolNot

data/lib/gisele/language/ast/bool_or.rb

@@ -5,7 +5,7 @@ module Gisele
         include Node
 
         def label
-          markers[:match] ? markers[:match].to_s : "(#{self[1].label} or #{self[2].label})"
+          (citrus_match && citrus_match.to_s) || "(#{self[1].label} or #{self[2].label})"
         end
 
       end # module BoolOr

data/lib/gisele/language/ast/case_st.rb

@@ -11,4 +11,4 @@ module Gisele
       end # module CaseSt
     end # module AST
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/language/ast/else_clause.rb

@@ -11,4 +11,4 @@ module Gisele
       end # module ElseClause
     end # module AST
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/language/ast/node.rb

@@ -3,63 +3,8 @@ module Gisele
     module AST
       module Node
 
-        # Returns the node markers
-        def markers
-          @markers ||= {}
-        end
-
-        # Sets node markers
-        def markers=(markers)
-          @markers = markers
-        end
-
-        # Returns the rule name, that is, the first Symbol element
-        # of the node array.
-        #
-        # Example:
-        #     file = ... path to a .gis file ...
-        #     Gisele.ast(file).rule_name
-        #     # => :unit
-        #
-        def rule_name
-          first
-        end
-
-        # Returns the children of this node.
-        #
-        # Children are defined as all but the rule name in the underlying
-        # array.
-        #
-        def children
-          self[1..-1]
-        end
-
-        # Returns the associated ast_module
-        def ast_module
-          AST::Helpers.send(:ast_module, self)
-        end
-
-        # Applies copy-and-transform to this node.
-        #
-        # Example:
-        #   node = AST.node([:something, "world", [:subnode ...]])
-        #   node.copy do |base,child|
-        #     base << ... make something with child ...
-        #   end
-        #   # => [:something, ...]
-        #
-        def copy(&block)
-          base = AST.node([rule_name], markers.dup)
-          children.inject(base, &block)
-        end
-
-        # Duplicates this node.
-        #
-        # This method ensures that the node marking through modules
-        # will correctly be applied to the duplicated array.
-        #
-        def dup
-          AST.node(super, markers.dup)
+        def citrus_match
+          tracking_markers[:citrus_match]
         end
 
         # Returns a label for this AST node
@@ -67,22 +12,15 @@ module Gisele
           ""
         end
 
-        # Returns attributes to use for dot printing
-        def dot_attributes
-          attrs = Language::DOT_ATTRIBUTES[rule_name.to_s] || {}
-          attrs.merge(:label => label)
-        end
-
         # Checks validity over the definition
         def ===(sexp)
-          SEXP_GRAMMAR[rule_name] === sexp
+          Language[rule_name] === sexp
         end
 
       end # module Node
     end # module AST
   end # module Language
 end # module Gisele
-require_relative 'unit_def'
 require_relative 'task_call_st'
 require_relative 'while_st'
 require_relative 'if_st'
@@ -94,4 +32,4 @@ require_relative 'bool_expr'
 require_relative 'bool_and'
 require_relative 'bool_or'
 require_relative 'bool_not'
-require_relative 'var_ref'
+require_relative 'var_ref'

data/lib/gisele/language/grammar.citrus

@@ -1,4 +1,4 @@
-grammar Gisele::Language::Syntax::Grammar
+grammar Gisele::Language::Grammar
 
   ### Units
 
@@ -233,4 +233,4 @@ grammar Gisele::Language::Syntax::Grammar
     | "false"
   end
 
-end
+end

data/lib/gisele/language/grammar.sexp.yml

@@ -1,80 +1,83 @@
-### units and tasks
-unit_def:
-  - [task_def+]
-task_def:
-  - [task_name, some_def*, statement]
-some_def:
-  - fluent_def
-  - trackvar_def
-  - task_def
-### variables
-fluent_def:
-  - [var_name, event_set, event_set, initially]
-trackvar_def:
-  - [var_name, event_set, event_set, initially]
-event_set:
-  - [event*]
-event:
-  - event_name
-  - task_event_name
-var_ref:
-  - [var_name]
-### statements
-statement:
-  - if_st
-  - case_st
-  - while_st
-  - seq_st
-  - par_st
-  - task_call_st
-  - nop_st
-if_st:
-  - [bool_expr, statement, elsif_clause*, "else_clause?"]
-case_st:
-  - [[var_ref, ~], when_clause+, "else_clause?"]
-while_st:
-  - [bool_expr, statement]
-seq_st:
-  - [statement+]
-par_st:
-  - [statement+]
-task_call_st:
-  - [task_name]
-nop_st:
-  - []
-### clauses
-elsif_clause:
-  - [bool_expr, statement]
-else_clause:
-  - [statement]
-when_clause:
-  - [bool_expr, statement]
-### boolean expressions
-bool_expr:
-  - [bool_expression]
-bool_expression:
-  - bool_or
-  - bool_and
-  - bool_not
-  - var_ref
-  - bool_lit
-bool_or:
-  - [bool_expression, bool_expression]
-bool_and:
-  - [bool_expression, bool_expression]
-bool_not:
-  - [bool_expression]
-bool_lit:
-  - [ boolean_literal  ]
-boolean_literal:
-  - true
-  - false
-### terminals
-task_name:       !ruby/regexp /^[A-Z][A-Za-z0-9_]*$/
-var_name:        !ruby/regexp /^[a-z][A-Za-z0-9_]*$/
-event_name:      !ruby/regexp /^[a-z][a-z0-9_]*$/
-task_event_name: !ruby/regexp /^[A-Z][A-Za-z0-9_]*:(start|end)$/
-initially:
-  - true
-  - false
-  - ~
+parser:
+  grammar.citrus
+rules:
+  ### units and tasks
+  unit_def:
+    - [task_def+]
+  task_def:
+    - [task_name, some_def*, statement]
+  some_def:
+    - fluent_def
+    - trackvar_def
+    - task_def
+  ### variables
+  fluent_def:
+    - [var_name, event_set, event_set, initially]
+  trackvar_def:
+    - [var_name, event_set, event_set, initially]
+  event_set:
+    - [event*]
+  event:
+    - event_name
+    - task_event_name
+  var_ref:
+    - [var_name]
+  ### statements
+  statement:
+    - if_st
+    - case_st
+    - while_st
+    - seq_st
+    - par_st
+    - task_call_st
+    - nop_st
+  if_st:
+    - [bool_expr, statement, elsif_clause*, "else_clause?"]
+  case_st:
+    - [[var_ref, ~], when_clause+, "else_clause?"]
+  while_st:
+    - [bool_expr, statement]
+  seq_st:
+    - [statement+]
+  par_st:
+    - [statement+]
+  task_call_st:
+    - [task_name]
+  nop_st:
+    - []
+  ### clauses
+  elsif_clause:
+    - [bool_expr, statement]
+  else_clause:
+    - [statement]
+  when_clause:
+    - [bool_expr, statement]
+  ### boolean expressions
+  bool_expr:
+    - [bool_expression]
+  bool_expression:
+    - bool_or
+    - bool_and
+    - bool_not
+    - var_ref
+    - bool_lit
+  bool_or:
+    - [bool_expression, bool_expression]
+  bool_and:
+    - [bool_expression, bool_expression]
+  bool_not:
+    - [bool_expression]
+  bool_lit:
+    - [ boolean_literal  ]
+  boolean_literal:
+    - true
+    - false
+  ### terminals
+  task_name:       !ruby/regexp /^[A-Z][A-Za-z0-9_]*$/
+  var_name:        !ruby/regexp /^[a-z][A-Za-z0-9_]*$/
+  event_name:      !ruby/regexp /^[a-z][a-z0-9_]*$/
+  task_event_name: !ruby/regexp /^[A-Z][A-Za-z0-9_]*:(start|end)$/
+  initially:
+    - true
+    - false
+    - ~

data/lib/gisele/language/processors.rb

@@ -1,4 +1,4 @@
+require_relative 'processors/scoping_helper'
 require_relative 'processors/elsif_flattener'
 require_relative 'processors/if_to_case'
-require_relative 'processors/sugar_removal'
-require_relative 'processors/to_graph'
+require_relative 'processors/sugar_removal'

data/lib/gisele/language/processors/elsif_flattener.rb

@@ -1,16 +1,16 @@
 module Gisele
   module Language
-    class ElsifFlattener < Rewriter
-      alias :on_missing :copy_and_applyall
+    class ElsifFlattener < Sexpr::Rewriter
+      grammar Language
 
-      def on_if_st(node)
-        condition, dost, *clauses = node.children
+      def on_if_st(sexpr)
+        condition, dost, *clauses = sexpr.sexpr_body
 
         base = [:if_st, condition, dost]
-        base = node(base, node.markers.dup)
+        base = sexpr(base, sexpr.tracking_markers)
 
         clauses.inject base do |cur_if, clause|
-          rw_clause = call(clause)
+          rw_clause = apply(clause)
           cur_if << rw_clause
           rw_clause.last
         end
@@ -18,18 +18,19 @@ module Gisele
         base
       end
 
-      def on_elsif_clause(node)
+      def on_elsif_clause(sexpr)
         base = \
           [:else_clause,
-           [:if_st, node[1], mainflow.call(node[2])] ]
-        base = node(base, node.markers.dup)
+           [:if_st, sexpr[1], apply(sexpr[2])] ]
+        base = sexpr(base, sexpr.tracking_markers)
       end
 
-      def on_else_clause(node)
-        [:else_clause, mainflow.call(node.last)]
+      def on_else_clause(sexpr)
+        [:else_clause, apply(sexpr.last)]
       end
 
+      alias :on_missing :copy_and_apply
+
     end # class ElsifFlattener
   end # module Language
-end # module Gisele
-
+end # module Gisele