loxxy 0.1.09 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d027baa99cb59b7a102b55d1dec07e75f7cb17a71c42708881507ae8bc83b75
-  data.tar.gz: 6f27ba42c296a5845185fb8d746fd8cf24d9b8b71c2c98d590fa8a9c22cac33f
+  metadata.gz: 1fc5399ac3346487808eeb40403b3324cca384e3c6820d965b75f2e320759d2c
+  data.tar.gz: f9b6497d87036f6c88ed09a72113a1ea004df9db8fd9bb945672c370993f7fde
 SHA512:
-  metadata.gz: 0b71f56915f53a4ece5bcfde6b74ee7d407517b54038b3a00a945813acd3137c5da8800f8ac2fea71220b35557d18eb63fef25ac0b90297b1067a9ed65e70a55
-  data.tar.gz: b6faed818eff75c6beb32137cd97777b332b9a79994ab74ddb70cc4a257778e8a2571ab59d8c612fc89e5bf5f3c7a4e9f3868748ae737b3fe0cce1e404681460
+  metadata.gz: 0b0fa0313a0b37882d0398238a65f10b6ea8ab4325447e1f4690ea7100bdb85dead8cb15d8e1e56b422741697d636c7e2c114cf17ad43781dc23462ab51c93af
+  data.tar.gz: b93b3d01a0e80def496ecfeb955e64000cc88149229ceb97e2743ccda863ec23677958aad9423dd0ca433d72451e120be6fa40247db7cbc49710ac8c17ea8987

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.1.10] - 2021-03-31
+- Flag return statements occurring outside functions as an error
+
+### Changed
+- Class `BackEnd::Resolver` Added attribute `current_function` to know whether the visited parse node is located inside a function
+
+
 ## [0.1.09] - 2021-03-28
 - Fix and test suite for return statements
 

data/lib/loxxy/back_end/resolver.rb

@@ -22,9 +22,14 @@ module Loxxy
       # @return [Hash {LoxNode => Integer}]
       attr_reader :locals
 
+      # An indicator that tells we're in the middle of a function declaration
+      # @return [Symbol] must be one of: :none, :function
+      attr_reader :current_function
+
       def initialize
         @scopes = []
         @locals = {}
+        @current_function = :none
       end
 
       # Given an abstract syntax parse tree visitor, launch the visit
@@ -69,6 +74,11 @@ module Loxxy
           msg = "Error at 'return': Can't return from top-level code."
           raise StandardError, msg
         end
+
+        if current_function == :none
+          msg = "Error at 'return': Can't return from outside a function."
+          raise StandardError, msg
+        end
       end
 
       def after_while_stmt(aWhileStmt, aVisitor)
@@ -112,7 +122,7 @@ module Loxxy
       def before_fun_stmt(aFunStmt, aVisitor)
         declare(aFunStmt.name)
         define(aFunStmt.name)
-        resolve_function(aFunStmt, aVisitor)
+        resolve_function(aFunStmt, :function ,aVisitor)
       end
 
       private
@@ -162,7 +172,9 @@ module Loxxy
         end
       end
 
-      def resolve_function(aFunStmt, aVisitor)
+      def resolve_function(aFunStmt, funVisitState, aVisitor)
+        enclosing_function = current_function
+        @current_function = funVisitState
         begin_scope
 
         aFunStmt.params&.each do |param_name|
@@ -176,6 +188,7 @@ module Loxxy
         end
 
         end_scope
+        @current_function = enclosing_function
       end
     end # class
   end # mmodule

data/lib/loxxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loxxy
-  VERSION = '0.1.09'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.09
+  version: 0.1.10
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley