pycplus 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fde7222ccd4137c44659d5df46a12bc2cb57facbb373c129d54af19596aeb93
-  data.tar.gz: b86597ee3514507775c3a2be65e9fd8ed1f2778be48d276b45b99898e0ba8223
+  metadata.gz: 9ba4de43decc549bf60ae97669e59b7e8dc597897d9f9f943c9547e93f260880
+  data.tar.gz: a8e6c2e1815da2725a6f5af2841a6d9ff7db0bf5ec58fd6a05ccde637df12a96
 SHA512:
-  metadata.gz: 1437d02dc107e13a85893882db8d325e42d46e62783eeb27c7c58cbf4ce08bc844103e011084a36686ed465fac755bb3e45f96b274e9df4788637fd64ae33bfc
-  data.tar.gz: 03faa5bad0cd3ca3242d64e236995baa1d03337d68fe013d3152e6f2a82d74919c8311cd2d1c1361486a8ff55515134d7cd7c0e3be9931b9f72533160f6adb74
+  metadata.gz: 1fdf3493c38f21ed5d515f1b4ea4c80849913ac6a4b6398bc6000a27df445ffa8161222cc9115d9bae0162b06809dc5531576d5182e0525ca998f74ad3f6895d
+  data.tar.gz: d51d284dac74989f444902c43ff177e706daf2887bf4e6fd80aae0aa250c744d6b6f9d979d61862ecc8353195b12c91cfaeacec0a8e77cd7eb974c759aafa412

data/bin/pycplus

@@ -7,7 +7,7 @@ require_relative '../lib/pcpparse'
 
 # Method to print gem version
 def print_version
-    spec = Gem::Specification.load('../pycplus.gemspec')
+    spec = Gem.loaded_specs['pycplus']
     puts "#{spec.name} version #{spec.version}"
 end
 

data/lib/nodes.rb

@@ -2,38 +2,51 @@
 
 require_relative 'STL.rb'
 
+# Class to handle scopes when evaluating AST.
 class Scope
-  attr_reader :identifiers,:parent_scope
+  attr_reader :identifiers,:parent_scope, :non_local_variables
   def initialize(parent_scope = nil)
     @identifiers = {}
+    @non_local_variables = []
     @parent_scope = parent_scope
   end
 
+  # Set variable in current scope
   def set_variable(name, op, expression)
+    if @non_local_variables.include?(name)
+      raise NameError, "local identifier #{name} referenced before assignment"
+    end
     if op == '='
       @identifiers[name] = expression
     else
-      id_scope = get_scope(name)
-      @identifiers[name] = get_identifier(name) if id_scope
+      unless @identifiers.has_key?(name)
+        raise NameError, "local identifier #{name} referenced before assignment"
+      end
       if op == '+='
-        @identifiers[name] = 0 if !id_scope
         @identifiers[name] += expression
       else
-        @identifiers[name] = 0 if !id_scope
         @identifiers[name] -= expression
       end
     end
   end
 
+  def set_non_local_variable(name)
+    unless @non_local_variables.include?(name) && is_function(name)
+      @non_local_variables.append(name)
+    end
+  end
+
+  # Get value of identifier in current or parent scope(s) if defined.
   def get_identifier(name)
     scope = get_scope(name)
     if scope
       return scope.identifiers[name]
     else
-      raise NameError,"Identifier #{name} not defined."
+      raise NameError,"Identifier #{name} not defined in scope."
     end
   end
 
+  # Get first scope where identifier is defined.
   def get_scope(name)
     if @identifiers.has_key?(name)
       return self
@@ -42,17 +55,20 @@ class Scope
     end
   end
 
+  # Checks if a identifier is a function.
   def is_function?(name)
     scope = get_scope(name)
     id_value = scope.get_identifier(name) if scope
     return id_value.is_a?(Hash) 
   end
 
+  # Set a function in current scope.
   def set_function(name, block, parameters)
     @identifiers[name] = {:parameters => parameters, :block => block}
   end
 end
 
+
 class BlockNode
   def initialize(statements = nil)
     @block = statements
@@ -102,10 +118,10 @@ class FunctioncallNode
     return result
   end
 
-  def evaluate_block(parameters, block, scope)
-    new_scope = Scope.new(scope)
+  def evaluate_block(parameters, block, current_scope, id_scope)
+    new_scope = Scope.new(id_scope)
     parameters.zip(@arguments).each do |parameter, argument|
-      new_scope.set_variable(parameter, '=', argument.evaluate(scope))
+      new_scope.set_variable(parameter, '=', argument.evaluate(current_scope))
     end
 
     result = block.evaluate(new_scope)
@@ -135,7 +151,7 @@ class FunctioncallNode
       parameters = function[:parameters]
       block = function[:block]
       validate_arguments(parameters)
-      evaluate_block(parameters, block, scope)
+      evaluate_block(parameters, block,scope,id_scope)
     end
   end
 end
@@ -274,9 +290,12 @@ class IdentifierNode < PrimitiveNode
   def evaluate(scope)
     if scope.is_function?(@value)
       raise SyntaxError, "Identifier #{@value} is assigned to a function. Please use correct syntax for function call."
-    else
-      return scope.get_identifier(@value)
     end
+    id_value = scope.get_identifier(@value)
+    unless scope.identifiers.has_key?(@value)
+      scope.set_non_local_variable(@value)
+    end
+    return id_value
   end
 end
 
@@ -287,4 +306,5 @@ class DigitNode < PrimitiveNode
 end
 
 class BoolNode < PrimitiveNode
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pycplus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Johannes