halunke 0.2.0 → 0.3.0

data/lib/halunke/lexer.rl

@@ -5,15 +5,17 @@
   number = ('+'|'-')?[0-9]+('.'[0-9]+)?;
   string = '"' [^"]* '"';
   unassigned_bareword = "'" [a-zA-Z_]+;
-  bareword = [a-zA-Z_]+;
+  bareword = [a-zA-Z_]+ | '+' | '-' | '<' | '>' | '=' | '@';
   open_paren = '(';
   close_paren = ')';
   open_curly = '{';
   close_curly = '}';
   open_bracket = '[';
   close_bracket = ']';
+  open_dict_bracket = '@[';
+  start_comment = '/*';
+  end_comment = '*/';
   bar = "|";
-  operator = '+' | '-' | '<' | '>' | '=';
 
   main := |*
 
@@ -27,8 +29,10 @@
     close_curly => { emit(:CLOSE_CURLY, data[ts...te]) };
     open_bracket => { emit(:OPEN_BRACKET, data[ts...te]) };
     close_bracket => { emit(:CLOSE_BRACKET, data[ts...te]) };
+    open_dict_bracket => { emit(:OPEN_DICT_BRACKET, data[ts...te]) };
+    start_comment => { emit(:START_COMMENT, data[ts...te]) };
+    end_comment => { emit(:END_COMMENT, data[ts...te]) };
     bar => { emit(:BAR, data[ts...te]) };
-    operator => { emit(:OPERATOR, data[ts ... te]) };
     space;
     any => { raise "Could not lex '#{ data[ts...te] }'" };
 

data/lib/halunke/nodes.rb

@@ -1,41 +1,35 @@
-require "halunke/runtime"
-
 module Halunke
   Nodes = Struct.new(:nodes) do
-    def initialize(nodes = [])
-      super(nodes)
+    def eval(context)
+      nodes.map { |node| node.eval(context) }.last
     end
 
-    def concat(other)
-      Nodes.new(nodes.concat(other.nodes))
+    def to_message
+      MessageNode.new(nodes)
     end
 
-    def eval(context)
-      val = nil
-
-      nodes.each do |node|
-        val = node.eval(context)
-      end
+    def to_array
+      ArrayNode.new(nodes)
+    end
 
-      val
+    def to_dictionary
+      DictionaryNode.new(nodes)
     end
   end
 
-  LiteralNode = Struct.new(:value)
-
-  class NumberNode < LiteralNode
+  NumberNode = Struct.new(:value) do
     def eval(context)
       context["Number"].create_instance(value)
     end
   end
 
-  class StringNode < LiteralNode
+  StringNode = Struct.new(:value) do
     def eval(context)
       context["String"].create_instance(value)
     end
   end
 
-  class BarewordNode < LiteralNode
+  BarewordNode = Struct.new(:value) do
     def eval(context)
       context[value]
     end
@@ -43,28 +37,33 @@ module Halunke
 
   UnassignedNode = Struct.new(:node) do
     def eval(context)
-      raise "Not unassigned: #{node.value} has value #{context[node.value].inspect}" if context.key? node.value
       context["UnassignedBareword"].create_instance(node.value)
     end
   end
 
   FunctionNode = Struct.new(:params, :body) do
-    def eval(_context)
+    def eval(context)
       signature = params.nodes.map(&:node).map(&:value)
 
-      HFunction.new(signature, lambda { |context|
-        body.eval(context)
+      context["Function"].new(signature, lambda { |call_context|
+        body.eval(call_context)
       })
     end
   end
 
   ArrayNode = Struct.new(:nodes) do
-    def initialize(nodes = [])
-      super(nodes)
+    def eval(context)
+      context["Array"].create_instance(nodes.map { |node| node.eval(context) })
     end
+  end
 
+  DictionaryNode = Struct.new(:nodes) do
     def eval(context)
-      context["Array"].create_instance(nodes.map { |node| node.eval(context) })
+      hash = {}
+      nodes.each_slice(2) do |key, value|
+        hash[key.eval(context)] = value.eval(context)
+      end
+      context["Dictionary"].create_instance(hash)
     end
   end
 

data/lib/halunke/parser.rb

@@ -13,7 +13,7 @@ require "halunke/nodes"
 module Halunke
   class Parser < Racc::Parser
 
-module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 64)
+module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 48)
 
 def parse(code)
   @tokens = Lexer.new.tokenize(code)
@@ -27,72 +27,80 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     9,    10,     6,    13,     5,    20,    11,    12,     7,
-    21,    17,     8,     9,    10,     6,    25,     5,    27,    11,
-    12,     7,     8,     9,    10,     6,    28,     5,    29,    11,
-    12,     7,     8,     9,    10,     6,    25,     5,    31,    11,
-    12,     7,     8,     9,    10,     6,   nil,     5,   nil,    11,
-    12,     7,     8,     9,    10,     6,   nil,     5,   nil,    11,
-    12,     7,     8,     9,    10,     6,   nil,     5,   nil,    11,
-    12,     7 ]
+     4,     5,     6,    10,    13,     9,    21,     7,    11,    22,
+    12,    23,     8,     4,     5,     6,    10,    26,     9,    27,
+     7,    11,    28,    12,    29,     8,     4,     5,     6,    10,
+    31,     9,   nil,     7,    11,   nil,    12,   nil,     8,     4,
+     5,     6,    10,   nil,     9,   nil,     7,    11,   nil,    12,
+    17,     8,     4,     5,     6,    10,   nil,     9,   nil,     7,
+    11,   nil,    12,   nil,     8,     4,     5,     6,    10,   nil,
+     9,   nil,     7,    11,   nil,    12,   nil,     8,     4,     5,
+     6,    10,   nil,     9,   nil,     7,    11,   nil,    12,   nil,
+     8,     4,     5,     6,    10,   nil,     9,   nil,     7,    11,
+   nil,    12,   nil,     8,     4,     5,     6,    10,   nil,     9,
+   nil,     7,    11,   nil,    12,   nil,     8,     4,     5,     6,
+    10,   nil,     9,   nil,     7,    11,   nil,    12,   nil,     8 ]
 
 racc_action_check = [
-     5,     5,     5,     5,     1,     5,    13,     5,     5,     5,
-    15,     5,     0,     0,     0,     0,    17,     0,    19,     0,
-     0,     0,     3,     3,     3,     3,    22,     3,    23,     3,
-     3,     3,     6,     6,     6,     6,    24,     6,    26,     6,
-     6,     6,     7,     7,     7,     7,   nil,     7,   nil,     7,
-     7,     7,    16,    16,    16,    16,   nil,    16,   nil,    16,
-    16,    16,    18,    18,    18,    18,   nil,    18,   nil,    18,
-    18,    18 ]
+     0,     0,     0,     0,     1,     0,    13,     0,     0,    15,
+     0,    16,     0,     3,     3,     3,     3,    19,     3,    20,
+     3,     3,    24,     3,    25,     3,     8,     8,     8,     8,
+    30,     8,   nil,     8,     8,   nil,     8,   nil,     8,     9,
+     9,     9,     9,   nil,     9,   nil,     9,     9,   nil,     9,
+     9,     9,    10,    10,    10,    10,   nil,    10,   nil,    10,
+    10,   nil,    10,   nil,    10,    11,    11,    11,    11,   nil,
+    11,   nil,    11,    11,   nil,    11,   nil,    11,    12,    12,
+    12,    12,   nil,    12,   nil,    12,    12,   nil,    12,   nil,
+    12,    17,    17,    17,    17,   nil,    17,   nil,    17,    17,
+   nil,    17,   nil,    17,    18,    18,    18,    18,   nil,    18,
+   nil,    18,    18,   nil,    18,   nil,    18,    28,    28,    28,
+    28,   nil,    28,   nil,    28,    28,   nil,    28,   nil,    28 ]
 
 racc_action_pointer = [
-    10,     4,   nil,    20,   nil,    -2,    30,    40,   nil,   nil,
-   nil,   nil,   nil,     6,   nil,     2,    50,     6,    60,     6,
-   nil,   nil,    18,    15,    26,   nil,    32,   nil,   nil,   nil,
-   nil,   nil ]
+    -2,     4,   nil,    11,   nil,   nil,   nil,   nil,    24,    37,
+    50,    63,    76,     6,   nil,    -6,     3,    89,   102,     6,
+     8,   nil,   nil,   nil,     9,    18,   nil,   nil,   115,   nil,
+    22,   nil ]
 
 racc_action_default = [
-    -2,   -18,    -1,    -2,    -4,    -2,   -18,    -2,   -13,   -14,
-   -15,   -16,   -17,   -18,    -3,   -18,    -2,   -10,    -2,   -18,
-    32,    -5,   -18,   -18,   -10,   -12,   -18,    -8,    -6,    -9,
-   -11,    -7 ]
+    -2,   -14,    -1,    -2,    -4,    -5,    -6,    -7,    -2,    -2,
+   -14,    -2,    -2,   -14,    -3,   -14,   -14,    -2,    -2,   -14,
+   -14,    32,    -8,    -9,   -14,   -14,   -12,   -13,    -2,   -11,
+   -14,   -10 ]
 
 racc_goto_table = [
-     2,    23,     1,    14,    18,    15,    16,    19,    30,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    22,   nil,    26 ]
+     2,     1,    18,    14,   nil,   nil,   nil,   nil,    15,    16,
+   nil,    19,    20,   nil,   nil,   nil,   nil,    24,    25,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30 ]
 
 racc_goto_check = [
-     2,     6,     1,     2,     3,     2,     5,     2,     6,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,     2 ]
+     2,     1,     3,     2,   nil,   nil,   nil,   nil,     2,     2,
+   nil,     2,     2,   nil,   nil,   nil,   nil,     2,     2,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
-   nil,     2,     0,    -2,   nil,     1,   -16,   nil ]
+   nil,     1,     0,    -8 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     3,     4,   nil,   nil,    24 ]
+   nil,   nil,   nil,     3 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 15, :_reduce_1,
-  0, 16, :_reduce_2,
-  2, 16, :_reduce_3,
-  1, 17, :_reduce_none,
-  3, 17, :_reduce_5,
-  4, 17, :_reduce_6,
-  4, 17, :_reduce_7,
-  3, 17, :_reduce_8,
+  1, 17, :_reduce_1,
+  0, 18, :_reduce_2,
+  2, 18, :_reduce_3,
+  1, 19, :_reduce_4,
+  1, 19, :_reduce_5,
+  1, 19, :_reduce_6,
+  1, 19, :_reduce_7,
+  3, 19, :_reduce_8,
   3, 19, :_reduce_9,
-  0, 20, :_reduce_10,
-  2, 20, :_reduce_11,
-  1, 21, :_reduce_12,
-  1, 18, :_reduce_13,
-  1, 18, :_reduce_14,
-  1, 18, :_reduce_15,
-  1, 18, :_reduce_16,
-  1, 18, :_reduce_17 ]
+  6, 19, :_reduce_10,
+  4, 19, :_reduce_11,
+  3, 19, :_reduce_12,
+  3, 19, :_reduce_13 ]
 
-racc_reduce_n = 18
+racc_reduce_n = 14
 
 racc_shift_n = 32
 
@@ -106,13 +114,15 @@ racc_token_table = {
   :CLOSE_PAREN => 6,
   :OPEN_CURLY => 7,
   :CLOSE_CURLY => 8,
-  :OPERATOR => 9,
-  :UNASSIGNED_BAREWORD => 10,
-  :OPEN_BRACKET => 11,
-  :CLOSE_BRACKET => 12,
-  :BAR => 13 }
+  :UNASSIGNED_BAREWORD => 9,
+  :OPEN_BRACKET => 10,
+  :CLOSE_BRACKET => 11,
+  :OPEN_DICT_BRACKET => 12,
+  :BAR => 13,
+  :START_COMMENT => 14,
+  :END_COMMENT => 15 }
 
-racc_nt_base = 14
+racc_nt_base = 16
 
 racc_use_result_var = true
 
@@ -142,19 +152,17 @@ Racc_token_to_s_table = [
   "CLOSE_PAREN",
   "OPEN_CURLY",
   "CLOSE_CURLY",
-  "OPERATOR",
   "UNASSIGNED_BAREWORD",
   "OPEN_BRACKET",
   "CLOSE_BRACKET",
+  "OPEN_DICT_BRACKET",
   "BAR",
+  "START_COMMENT",
+  "END_COMMENT",
   "$start",
   "Program",
   "Expressions",
-  "Expression",
-  "Literal",
-  "Args",
-  "UnassignedBarewords",
-  "UnassignedBareword" ]
+  "Expression" ]
 
 Racc_debug_parser = false
 
@@ -162,116 +170,93 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 17)
+module_eval(<<'.,.,', 'grammar.y', 19)
   def _reduce_1(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 21)
+module_eval(<<'.,.,', 'grammar.y', 23)
   def _reduce_2(val, _values, result)
-     result = Nodes.new 
+     result = Nodes.new([]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 22)
+module_eval(<<'.,.,', 'grammar.y', 24)
   def _reduce_3(val, _values, result)
-     result = Nodes.new([val[0]]).concat(val[1]) 
+     result = Nodes.new([val[0]].concat(val[1].nodes)) 
     result
   end
 .,.,
 
-# reduce 4 omitted
+module_eval(<<'.,.,', 'grammar.y', 28)
+  def _reduce_4(val, _values, result)
+     result = NumberNode.new(val[0]) 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'grammar.y', 27)
+module_eval(<<'.,.,', 'grammar.y', 29)
   def _reduce_5(val, _values, result)
-     result = Halunke::FunctionNode.new(Halunke::ArrayNode.new([]), val[1]) 
+     result = StringNode.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 28)
+module_eval(<<'.,.,', 'grammar.y', 30)
   def _reduce_6(val, _values, result)
-     result = Halunke::FunctionNode.new(val[1], val[2]) 
+     result = BarewordNode.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 29)
+module_eval(<<'.,.,', 'grammar.y', 31)
   def _reduce_7(val, _values, result)
-     result = Halunke::MessageSendNode.new(val[1], MessageNode.new(val[2].nodes)) 
+     result = UnassignedNode.new(BarewordNode.new(val[0])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 30)
+module_eval(<<'.,.,', 'grammar.y', 32)
   def _reduce_8(val, _values, result)
-     result = ArrayNode.new(val[1].nodes) 
+     result = Nodes.new([]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 34)
+module_eval(<<'.,.,', 'grammar.y', 33)
   def _reduce_9(val, _values, result)
-     result = Halunke::ArrayNode.new(val[1].nodes) 
+     result = FunctionNode.new(ArrayNode.new([]), val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 38)
+module_eval(<<'.,.,', 'grammar.y', 34)
   def _reduce_10(val, _values, result)
-     result = Nodes.new 
+     result = FunctionNode.new(val[2].to_array, val[4]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 39)
+module_eval(<<'.,.,', 'grammar.y', 35)
   def _reduce_11(val, _values, result)
-     result = Nodes.new([val[0]]).concat(val[1]) 
+     result = MessageSendNode.new(val[1], val[2].to_message) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 43)
+module_eval(<<'.,.,', 'grammar.y', 36)
   def _reduce_12(val, _values, result)
-     result = UnassignedNode.new(BarewordNode.new(val[0])) 
+     result = val[1].to_array 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 47)
+module_eval(<<'.,.,', 'grammar.y', 37)
   def _reduce_13(val, _values, result)
-     result = NumberNode.new(val[0]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 48)
-  def _reduce_14(val, _values, result)
-     result = StringNode.new(val[0]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 50)
-  def _reduce_15(val, _values, result)
-     result = BarewordNode.new(val[0]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 51)
-  def _reduce_16(val, _values, result)
-     result = BarewordNode.new(val[0]) 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.y', 52)
-  def _reduce_17(val, _values, result)
-     result = UnassignedNode.new(BarewordNode.new(val[0])) 
+     result = val[1].to_dictionary 
     result
   end
 .,.,