alphalang 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46055bf730f2a26ce876fcc685a711359a5e80710da1e86e7eac6e7554af007
-  data.tar.gz: d2751a739b78101ce213c6b29db88fbcc57a0c33dad4282f5bf1d5e385ba7461
+  metadata.gz: 8f0ae223746d2a819889026bde1c6ec27b0d331567aa0734fdbbc824b45d4625
+  data.tar.gz: d3b0e9a67edcd936217b50d931c3993ab32c5c8efca805cb1dfbe0a6b260fa3e
 SHA512:
-  metadata.gz: c873cf09f9c0831cbfd15a9f7cdc01a29e2bbe035cf9b04033ea5b6c14be54a7b95d34ed278658892ce9c56e6b1ab81ed998e220ca8a21898c08efe8c4feb2e2
-  data.tar.gz: a34c736242f1b4ab7a5f42d1a3173ada74add81c83e1d6da106c91ccef75f457b2bb73e18bca3f81264c1f0a6ab1b3d09c8edd737ecb4d443623858ef4502674
+  metadata.gz: 5022eaae630f0fbc43485f5b5bf3d55e3c0bcc577818edc2f2aeb209f2f323ca233c2ae6d015f296a47caf45c5958626f5d69a6be9e8100fdf3b104f48ab2571
+  data.tar.gz: ae51f1d99f90e029b9a2569dd5cb3bb78c48f06bb080781b0c5a3631d05433d922eb990790f2a985dd0435fe4461f98cbbb1004e7b47e40399574271f96929b6

data/lib/nodes/basenodes.rb

@@ -2,30 +2,6 @@
 
 ####################################################
 
-class TrueClass
-  def evaluate
-    self
-  end
-end
-
-class FalseClass
-  def evaluate
-    self
-  end
-end
-
-class String
-  def name
-    self
-  end
-
-  def evaluate
-    self
-  end
-end
-
-####################################################
-
 class Node
   attr_accessor :value
 
@@ -58,7 +34,6 @@ end
 
 class BoolNode < Node
   def initialize(value)
-    @value = false
     @value = true if value == ScopeManager.true_value
     @value = false if value == ScopeManager.false_value
   end
@@ -69,32 +44,32 @@ class BoolNode < Node
 end
 
 class AndNode < Node
-  def initialize(node1, node2)
-    @node1, @node2 = node1, node2
-    if @node2.class.method_defined? (:lhs)
-      if @node2.lhs == nil
-        @node2.lhs = @node1.lhs
+  def initialize(lhs, rhs)
+    @lhs, @rhs = lhs, rhs
+    if @rhs.class.method_defined? (:lhs)
+      if @rhs.lhs == nil
+        @rhs.lhs = @lhs.lhs
       end
     end
   end
 
   def evaluate
-    @node1.evaluate && @node2.evaluate
+    @lhs.evaluate && @rhs.evaluate
   end
 end
 
 class OrNode < Node
-  def initialize(node1, node2)
-    @node1, @node2 = node1, node2
-    if @node2.class.method_defined? (:lhs)
-      if @node2.lhs == nil
-        @node2.lhs = @node1.lhs
+  def initialize(lhs, rhs)
+    @lhs, @rhs = lhs, rhs
+    if @rhs.class.method_defined? (:lhs)
+      if @rhs.lhs == nil
+        @rhs.lhs = @lhs.lhs
       end
     end
   end
 
   def evaluate
-    @node1.evaluate || @node2.evaluate
+    @lhs.evaluate || @rhs.evaluate
   end
 end
 
@@ -113,8 +88,8 @@ end
 class CompareNode < Node
   attr_accessor :lhs, :op, :rhs
 
-  def initialize(node1, op, node2)
-    @lhs, @op, @rhs = node1, op, node2
+  def initialize(lhs, op, rhs)
+    @lhs, @op, @rhs = lhs, op, rhs
   end
 
   def evaluate
@@ -137,6 +112,16 @@ class BinaryOperationNode < Node
       return @value = @lhs.evaluate.append(@rhs.evaluate)
     end
 
+    if @rhs.evaluate.is_a?(ArrayNode) && @op == '-'
+      return @value = @rhs.evaluate - @lhs.evaluate
+    elsif @lhs.evaluate.is_a?(Array) && @op == '-'
+      return @lhs.evaluate.reject { |v| v.evaluate == @rhs.evaluate }
+    end
+
+    if @rhs.evaluate.is_a?(ArrayNode) or @rhs.evaluate.is_a?(Array) and @lhs.evaluate.is_a?(Numeric)
+      raise SyntaxError, "You can't subtract and array from a number! #{@lhs.evaluate} #{@op} #{@rhs.name}"
+    end
+
     if @op == '/'
       @value = @lhs.evaluate.to_f.send(@op, @rhs.evaluate)
     else
@@ -186,8 +171,16 @@ class ArrayNode < Node
     puts @value.join(', ')
   end
 
-  def +(index)
-    @value.append(index)
+  def to_s
+    @value.join(', ')
+  end
+
+  def +(value)
+    @value.append(value)
+  end
+
+  def -(value)
+    @value.reject { |v| v.evaluate == value }
   end
 
   def [](index)

data/lib/nodes/scopemanager.rb

@@ -56,7 +56,11 @@ class ScopeManager
   end
 
   def self.add_to_current_scope(name, value)
-    @@scopes[@@scope_lvl][name.name] = value.evaluate
+    if name.is_a?(String)
+      @@scopes[@@scope_lvl][name] = value.evaluate
+    else
+      @@scopes[@@scope_lvl][name.name] = value.evaluate
+    end
   end
 
   def self.add_func_to_global_scope(name, value, args)

data/lib/nodes/stmtnodes.rb

@@ -94,32 +94,28 @@ class IfNode < Node
   end
 
   def evaluate
-    if @argument.evaluate
-      @value = @node.evaluate
-    else
-      @value = nil
-    end
-    @value
+    @value = @node.evaluate
   end
 end
 
 class ElseifNode < Node
   attr_accessor :argument
+
   def initialize(argument, node)
     @argument, @node = argument, node
   end
+
   def evaluate
-    if @argument.evaluate
-      @value = @node.evaluate
-    end
+    @value = @node.evaluate
   end
 end
 
 class ElseNode < Node
   attr_accessor :argument, :node
+
   def initialize(node)
     @node = node
-    @argument = true
+    @argument = BoolNode.new(ScopeManager.true_value)
   end
 
   def evaluate
@@ -189,11 +185,18 @@ class PrintNode
   def evaluate
     if @value.evaluate.is_a?(ArrayNode)
       print "Array #{@value.name}: "
-      @value.evaluate.display_on_one_line
+      puts @value.evaluate
     elsif @value.evaluate.is_a?(Array)
       print "Array #{@value.name}: "
       puts @value.evaluate.join(', ')
     else
+      if @value.evaluate == PrintNode
+        if @value.value.is_a?(VariableCallNode)
+          raise SyntaxError, "You have a duplicate 'print' statement! Printing #{@value.value.name} twice."
+        else
+          raise SyntaxError, "You have a duplicate 'print' statement! Printing #{@value.value} twice."
+        end
+      end
       puts @value.evaluate
     end
     self.class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphalang
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - mattias, victor