halunke 0.9.0 → 0.10.1

data/docs/index.md

@@ -70,10 +70,10 @@ the value is `["Ha" "Spe"]`.
 If you want to find out more about the types of objects in Halunke
 and the messages you can send to them, explore the navigation bar
 at the top. If you want to learn more about conditionals, check out
-the section about [True & False](/halunke/true-false). If you want
+the section about [True & False](/true-false). If you want
 to write your own functions, check out
-[Function](/halunke/function) and if you want to define your own
-classes, check out [Class](/halunke/class).
+[Function](/function) and if you want to define your own
+classes, check out [Class](/class).
 
 If you want to store an object in a variable, you can do it like this:
 
@@ -87,7 +87,7 @@ with a value, and it will assign it. Be aware that you can't reassign. So if
 you assign something to a once, it will stay like this forever (within that
 scope). Reassigning will result in an error. *There will be reassignable
 references in the future, see [the issue for
-details](https://github.com/moonglum/halunke/issues/3)*
+details](https://codeberg.org/moonglum/halunke/issues/3)*
 
 The values are also immutable. If you send a message to an object,
 it will not change the object, but it will return an answer to you.

data/docs/stdio.md

@@ -4,7 +4,7 @@ title: Stdio
 
 The object `stdio` is available from everywhere. *This will change in the
 future. [Interacting with STDIO is IO and will be
-isolated.](https://github.com/moonglum/halunke/issues/4)*
+isolated.](https://codeberg.org/moonglum/halunke/issues/4)*
 
 ## `puts`
 

data/docs/web.md

@@ -4,7 +4,7 @@ title: Web
 
 The object `web` is available from everywhere. *This will change in the future.
 [Interacting with STDIO is IO and will be
-isolated.](https://github.com/moonglum/halunke/issues/4)*
+isolated.](https://codeberg.org/moonglum/halunke/issues/4)*
 
 You can send the `run on` message to `web`. It expects the first object to be
 your application (more on that later) and the second one the bind address and

data/exe/halunke

@@ -1,16 +1,21 @@
 #!/usr/bin/env ruby
 
+if File.exist?(File.expand_path("../.git", __dir__))
+  lib = File.expand_path("../lib", __dir__)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+end
+
 require "halunke/version"
 require "halunke/interpreter"
-require "readline"
+require "reline"
 
 interpreter = Halunke::Interpreter.new
 
-Readline.completion_proc = ->(*) {[]}
+Reline.completion_proc = ->(*) {[]}
 
 if ARGV.length == 0
   puts "Halunke #{Halunke::VERSION} REPL. Ctrl+d to quit"
-  while (line = Readline.readline(">> ", true))
+  while (line = Reline.readline(">> ", true))
     begin
       value = interpreter.eval(line, error_mode: :repl)
       puts "=> #{value}" if value

data/halunke.gemspec

@@ -21,11 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", "~> 2.0.4"
-
-  spec.add_development_dependency "warning", "~> 0.10.1"
-  spec.add_development_dependency "bundler", "~> 1.17.2"
-  spec.add_development_dependency "rake", "~> 12.3.2"
-  spec.add_development_dependency "minitest", "~> 5.11.3"
-  spec.add_development_dependency "racc", "~> 1.4.15"
+  spec.add_dependency "rackup", "~> 2.3"
+  spec.add_dependency "webrick"
+  spec.add_dependency "reline"
 end

data/lib/halunke/grammar.y

@@ -27,15 +27,19 @@ rule
   | Expression Expressions { Nodes.new([val[0]].concat(val[1].nodes)) }
   ;
 
+  Arguments:
+    /* empty */         { ArrayNode.new([]) }
+  | BAR Expressions BAR { ArrayNode.new(val[1].nodes, val[0][1], val[2][2]) }
+  ;
+
   Expression:
     NUMBER                                                 { NumberNode.new(*val[0]) }
   | STRING                                                 { StringNode.new(*val[0]) }
   | BAREWORD                                               { BarewordNode.new(*val[0]) }
   | UNASSIGNED_BAREWORD                                    { UnassignedNode.new(BarewordNode.new(*val[0]), val[0][1], val[0][2]) }
   | START_COMMENT Expressions END_COMMENT                  { Nodes.new([]) }
-  | OPEN_CURLY Expressions CLOSE_CURLY                     { FunctionNode.new(ArrayNode.new([]), val[1], val[0][1], val[2][2]) }
-  | OPEN_CURLY BAR Expressions BAR Expressions CLOSE_CURLY { FunctionNode.new(ArrayNode.new(val[2].nodes), val[4], val[0][1], val[5][2]) }
-  | OPEN_PAREN Expression Expressions CLOSE_PAREN          { MessageSendNode.new(val[1], MessageNode.new(val[2].nodes), val[0][1], val[3][2]) }
+  | OPEN_CURLY Arguments Expressions CLOSE_CURLY           { FunctionNode.new(val[1], val[2], val[0][1], val[3][2]) }
+  | OPEN_PAREN Expressions CLOSE_PAREN                     { MessageSendNode.new(val[1].nodes, val[0][1], val[2][2]) }
   | OPEN_BRACKET Expressions CLOSE_BRACKET                 { ArrayNode.new(val[1].nodes, val[0][1], val[2][2]) }
   | OPEN_DICT_BRACKET Expressions CLOSE_BRACKET            { DictionaryNode.new(val[1].nodes, val[0][1], val[2][2]) }
   ;

data/lib/halunke/herror.rb

@@ -48,4 +48,13 @@ module Halunke
 
   class HUnknownAttribute < HError
   end
+
+  class HInvalidMessage < HError
+  end
+
+  class HInvalidDictionary < HError
+  end
+
+  class HInvalidMessageName < HError
+  end
 end

data/lib/halunke/nodes.rb

@@ -11,31 +11,40 @@ module Halunke
 
   NumberNode = Struct.new(:value, :ts, :te) do
     def eval(context)
-      context["Number"].create_instance(value)
+      context["Number"].create_instance(value,
+                                        source_code_position: source_code_position)
     end
 
     def ==(other)
       other.is_a?(NumberNode) &&
         value == other.value
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   StringNode = Struct.new(:value, :ts, :te) do
     def eval(context)
-      context["String"].create_instance(value)
+      context["String"].create_instance(value,
+                                        source_code_position: source_code_position)
     end
 
     def ==(other)
       other.is_a?(StringNode) &&
         value == other.value
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   BarewordNode = Struct.new(:value, :ts, :te) do
     def eval(context)
       context[value]
     rescue KeyError
-      source_code_position = SourceCodePosition.new(ts, te)
       raise HUnassignedBareword.new("Bareword '#{value} is unassigned", source_code_position)
     end
 
@@ -43,22 +52,30 @@ module Halunke
       other.is_a?(BarewordNode) &&
         value == other.value
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   UnassignedNode = Struct.new(:node, :ts, :te) do
     def eval(context)
-      context["UnassignedBareword"].create_instance(node.value, source_code_position: SourceCodePosition.new(ts, te))
+      context["UnassignedBareword"].create_instance(node.value, source_code_position: source_code_position)
     end
 
     def ==(other)
       other.is_a?(UnassignedNode) &&
         node == other.node
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   FunctionNode = Struct.new(:params, :body, :ts, :te) do
     def eval(context)
-      raise HEmptyFunction.new("This function would not return anything, in Halunke every function needs to return something.", SourceCodePosition.new(ts, te)) if body.empty?
+      raise HEmptyFunction.new("This function would not return anything, in Halunke every function needs to return something.", source_code_position) if body.empty?
       signature = params.nodes.map(&:node).map(&:value)
 
       context["Function"].new(signature, lambda { |call_context|
@@ -71,6 +88,10 @@ module Halunke
         params == other.params &&
         body == other.body
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   ArrayNode = Struct.new(:nodes, :ts, :te) do
@@ -82,56 +103,79 @@ module Halunke
       other.is_a?(ArrayNode) &&
         nodes == other.nodes
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
   DictionaryNode = Struct.new(:nodes, :ts, :te) do
     def eval(context)
       hash = {}
       nodes.each_slice(2) do |key, value|
+        raise HInvalidDictionary.new("This key has no value", key.source_code_position) if value.nil?
         hash[key.eval(context)] = value.eval(context)
       end
-      context["Dictionary"].create_instance(hash)
+      context["Dictionary"].create_instance(hash,
+                                            source_code_position: source_code_position)
     end
 
     def ==(other)
       other.is_a?(DictionaryNode) &&
         nodes == other.nodes
     end
+
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
   end
 
-  MessageSendNode = Struct.new(:receiver, :message, :ts, :te) do
+  MessageSendNode = Struct.new(:nodes, :ts, :te) do
     def eval(context)
-      receiver.eval(context).receive_message(context, *message.eval(context),
-                                             source_code_position: SourceCodePosition.new(ts, te))
+      message_name, message_value = parse_message(context)
+      receiver.eval(context).receive_message(context, message_name, message_value,
+                                             source_code_position: source_code_position)
     end
 
     def ==(other)
       other.is_a?(MessageSendNode) &&
-        receiver == other.receiver &&
-        message == other.message
+        nodes == other.nodes
     end
-  end
 
-  MessageNode = Struct.new(:nodes) do
-    def eval(context)
-      if nodes.length == 1
-        if nodes[0].is_a? NumberNode
-          # hack to allow expressions like (1+5)
-          ["+", [nodes[0].eval(context)]]
-        else
-          [nodes[0].value, []]
-        end
-      elsif nodes.length.even?
-        name = []
-        message = []
-        nodes.each_slice(2) do |name_part, value|
-          name.push(name_part.value)
-          message.push(value.eval(context))
-        end
-        [name.join(" "), message]
-      else
-        raise "Parse Error"
+    def source_code_position
+      SourceCodePosition.new(ts, te)
+    end
+
+    private
+
+    def receiver
+      raise HInvalidMessage.new("This message has no receiver", source_code_position) if nodes.length == 0
+      @receiver ||= nodes[0]
+    end
+
+    def parse_message(context)
+      if message_nodes.length == 1
+        # hack to allow expressions like (1+5)
+        return ["+", [message_nodes[0].eval(context)]] if message_nodes[0].is_a? NumberNode
+        return [message_nodes[0].value, []] if message_nodes[0].is_a? BarewordNode
+
+        raise HInvalidMessage.new("This is not a bareword", message_nodes[0].source_code_position)
+      end
+
+      name = []
+      message = []
+      message_nodes.each_slice(2) do |name_part, value|
+        raise HInvalidMessage.new("This is not a bareword", name_part.source_code_position) unless name_part.is_a? BarewordNode
+        raise HInvalidMessage.new("This bareword has no according argument", name_part.source_code_position) if value.nil?
+        name << name_part
+        message << value
       end
+      [name.map(&:value).join(" "), message.map { |node| node.eval(context) }]
+    end
+
+    def message_nodes
+      raise HInvalidMessage.new("You are sending an empty message", source_code_position) if nodes.length == 1
+      @message_nodes ||= nodes.drop(1)
     end
   end
 end