loxxy 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc5399ac3346487808eeb40403b3324cca384e3c6820d965b75f2e320759d2c
-  data.tar.gz: f9b6497d87036f6c88ed09a72113a1ea004df9db8fd9bb945672c370993f7fde
+  metadata.gz: aee9fb6c5101bc39682ab401ffc0434aea9e6c4115f74a4f641d0df2d68a03ad
+  data.tar.gz: ccc11c428ef206db9129fabbb97526df3477e03c5dce0b1b5a2f758425c8f9cb
 SHA512:
-  metadata.gz: 0b0fa0313a0b37882d0398238a65f10b6ea8ab4325447e1f4690ea7100bdb85dead8cb15d8e1e56b422741697d636c7e2c114cf17ad43781dc23462ab51c93af
-  data.tar.gz: b93b3d01a0e80def496ecfeb955e64000cc88149229ceb97e2743ccda863ec23677958aad9423dd0ca433d72451e120be6fa40247db7cbc49710ac8c17ea8987
+  metadata.gz: dbb1a28eb85868636b304aa3ec3c2fb71f3f37f5c573740bd7d577ed4e88374ce1fea5446e39429168228e68bedbddfccd554bc6c88ec7996621956e11a42a3c
+  data.tar.gz: 3b4c1d6b0996a351cfd7dae5d8f80683fcbdd1eeecc17c3a7932b0675285700dfecdabecc31f505243ffaf2f1bbc1bd8babb604c154f53dad0019c4ad96b007a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.1.11] - 2021-04-03
+- Intermediate version: `Loxxy` does class declarations
+
+### New
+- Class `Ast::LoxClassStmt` a syntax node that represents a class declaration
+- Method `Ast::ASTBuilder#reduce_class_decl` creates a `LoxClassStmt` instance
+- Method `Ast::ASTBuilder#reduce_class_name`
+- Method `Ast::ASTBuilder#reduce_reduce_class_body` collect the methods of the class
+- Method `Ast::ASTBuilder#reduce_method_plus_more` for dealing with methods
+- Method `Ast::ASTBuilder#reduce_method_plus_end`
+- Method `Ast::ASTVisitor#visit_class_stmt` for visiting an `Ast::LoxClassStmt` node
+- Method `Ast::LoxBlockStmt#empty?` returns true if the code block is empty
+- Method `BackEnd::Engine#after_class_stmt`
+- Method `BackEnd::Resolver#after_class_stmt`
+- Method `BackEnd::Resolver#before_class_stmt`
+- Class `BackEnd::LoxClass` implementation of a Lox class.
+
+### CHANGED
+- File `grammar.rb` refactoring of class declaration syntax rules
+
 ## [0.1.10] - 2021-03-31
 - Flag return statements occurring outside functions as an error
 
@@ -110,9 +130,9 @@
 - Method `Ast::ASTVisitor#visit_fun_stmt` for visiting an `Ast::LoxFunStmt` node
 - Method `Ast::LoxBlockStmt#empty?` returns true if the code block is empty
 - Method `BackEnd::Engine#after_fun_stmt`
-- Method `Backend::NativeFunction#call` 
-- Method `Backend::NativeFunction#to_str` 
-- Method `Backend::Function` implementation of a function object.
+- Method `BackEnd::NativeFunction#call` 
+- Method `BackEnd::NativeFunction#to_str` 
+- Method `BackEnd::LoxFunction` implementation of a function object.
 
 ### Changed
 - Method `BackEnd::Engine#after_call_expr`

data/lib/loxxy/ast/all_lox_nodes.rb

@@ -17,4 +17,5 @@ require_relative 'lox_print_stmt'
 require_relative 'lox_if_stmt'
 require_relative 'lox_for_stmt'
 require_relative 'lox_var_stmt'
+require_relative 'lox_class_stmt'
 require_relative 'lox_seq_decl'

data/lib/loxxy/ast/ast_builder.rb

@@ -163,6 +163,31 @@ module Loxxy
         [theChildren[0]]
       end
 
+      # rule('classDecl' => 'CLASS classNaming class_body')
+      def reduce_class_decl(_production, _range, _tokens, theChildren)
+        Ast::LoxClassStmt.new(tokens[1].position, theChildren[1], theChildren[2])
+      end
+
+      # rule('classNaming' => 'IDENTIFIER')
+      def reduce_class_name(_production, _range, _tokens, theChildren)
+        theChildren[0].token.lexeme
+      end
+
+      # rule('class_body' => 'LEFT_BRACE methods_opt RIGHT_BRACE')
+      def reduce_class_body(_production, _range, _tokens, theChildren)
+        theChildren[1]
+      end
+
+      # rule('method_plus' => 'method_plus function')
+      def reduce_method_plus_more(_production, _range, _tokens, theChildren)
+        theChildren[0] << theChildren[1]
+      end
+
+      # rule('method_plus' => 'function')
+      def reduce_method_plus_end(_production, _range, _tokens, theChildren)
+        theChildren
+      end
+
       # rule('funDecl' => 'FUN function')
       def reduce_fun_decl(_production, _range, _tokens, theChildren)
         theChildren[1]

data/lib/loxxy/ast/ast_visitor.rb

@@ -67,6 +67,14 @@ module Loxxy
         broadcast(:after_var_stmt, aVarStmt)
       end
 
+      # Visit event. The visitor is about to visit a class declaration.
+      # @param aXlassStmt [AST::LOXClassStmt] the for statement node to visit
+      def visit_class_stmt(aClassStmt)
+        broadcast(:before_class_stmt, aClassStmt)
+        traverse_subnodes(aClassStmt) # The methods are visited here...
+        broadcast(:after_class_stmt, aClassStmt, self)
+      end
+
       # Visit event. The visitor is about to visit a for statement.
       # @param aForStmt [AST::LOXForStmt] the for statement node to visit
       def visit_for_stmt(aForStmt)

data/lib/loxxy/ast/lox_class_stmt.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative 'lox_compound_expr'
+
+module Loxxy
+  module Ast
+    class LoxClassStmt < LoxCompoundExpr
+      attr_reader :name
+
+      # @param aPosition [Rley::Lexical::Position] Position of the entry in the input stream.
+      # @param condExpr [Loxxy::Ast::LoxNode] iteration condition
+      # @param theBody [Loxxy::Ast::LoxNode]
+      def initialize(aPosition, aName, theMethods)
+        super(aPosition, theMethods)
+        @name = aName.dup
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param visitor [Ast::ASTVisitor] the visitor
+      def accept(visitor)
+        visitor.visit_class_stmt(self)
+      end
+
+      alias body subnodes
+    end # class
+  end # module
+end # module

data/lib/loxxy/ast/lox_fun_stmt.rb

@@ -16,7 +16,7 @@ module Loxxy
       # @param body [Ast::LoxBlockStmt]
       def initialize(aPosition, aName, paramList, aBody)
         super(aPosition, [])
-        @name = aName
+        @name = aName.dup
         @params = paramList
         @body = aBody
       end

data/lib/loxxy/back_end/engine.rb

@@ -3,6 +3,7 @@
 # Load all the classes implementing AST nodes
 require_relative '../ast/all_lox_nodes'
 require_relative 'binary_operator'
+require_relative 'lox_class'
 require_relative 'lox_function'
 require_relative 'resolver'
 require_relative 'symbol_table'
@@ -68,6 +69,12 @@ module Loxxy
         # Do nothing, subnodes were already evaluated
       end
 
+      def after_class_stmt(aClassStmt, _visitor)
+        klass = LoxClass.new(aClassStmt.name, aClassStmt.methods, self)
+        new_var = Variable.new(aClassStmt.name, klass)
+        symbol_table.insert(new_var)
+      end
+
       def before_var_stmt(aVarStmt)
         new_var = Variable.new(aVarStmt.name, Datatype::Nil.instance)
         symbol_table.insert(new_var)

data/lib/loxxy/back_end/lox_class.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative '../datatype/all_datatypes'
+
+module Loxxy
+  module BackEnd
+    # Representation of a Lox class.
+    class LoxClass
+      # @return [String] The name of the class
+      attr_reader :name
+
+      # @return [Array<>] the list of methods
+      attr_reader :methods
+      attr_reader :stack
+
+      # Create a class with given name
+      # @param aName [String] The name of the class
+      def initialize(aName, theMethods, anEngine)
+        @name = aName.dup
+        @methods = theMethods
+        @stack = anEngine.stack
+      end
+
+      def accept(_visitor)
+        stack.push self
+      end
+
+      # Logical negation.
+      # As a function is a truthy thing, its negation is thus false.
+      # @return [Datatype::False]
+      def !
+        Datatype::False.instance
+      end
+
+      # Text representation of a Lox function
+      def to_str
+        name
+      end
+    end # class
+  end # module
+end # module

data/lib/loxxy/back_end/lox_function.rb

@@ -6,7 +6,6 @@ module Loxxy
   module BackEnd
     # rubocop: disable Style/AccessorGrouping
     # Representation of a Lox function.
-    # It is a named slot that can be associated with a value at the time.
     class LoxFunction
       # @return [String] The name of the function (if any)
       attr_reader :name
@@ -18,7 +17,7 @@ module Loxxy
       attr_reader :closure
 
       # Create a function with given name
-      # @param aName [String] The name of the variable
+      # @param aName [String] The name of the function
       def initialize(aName, parameterList, aBody, anEngine)
         @name = aName.dup
         @parameters = parameterList

data/lib/loxxy/back_end/resolver.rb

@@ -53,6 +53,15 @@ module Loxxy
         end_scope
       end
 
+      # A class declaration adds a new variable to current scope
+      def before_class_stmt(aClassStmt)
+        declare(aClassStmt.name)
+      end
+
+      def after_class_stmt(aClassStmt, _visitor)
+        define(aClassStmt.name)
+      end
+
       def before_for_stmt(aForStmt)
         before_block_stmt(aForStmt)
       end
@@ -122,7 +131,7 @@ module Loxxy
       def before_fun_stmt(aFunStmt, aVisitor)
         declare(aFunStmt.name)
         define(aFunStmt.name)
-        resolve_function(aFunStmt, :function ,aVisitor)
+        resolve_function(aFunStmt, :function, aVisitor)
       end
 
       private

data/lib/loxxy/front_end/grammar.rb

@@ -37,12 +37,14 @@ module Loxxy
       rule('declaration' => 'varDecl')
       rule('declaration' => 'statement')
 
-      rule('classDecl' => 'CLASS classNaming class_body')
+      rule('classDecl' => 'CLASS classNaming class_body').as 'class_decl'
       rule('classNaming' => 'IDENTIFIER LESS IDENTIFIER')
-      rule('classNaming' => 'IDENTIFIER')
-      rule('class_body' => 'LEFT_BRACE function_star RIGHT_BRACE')
-      rule('function_star' => 'function_star function')
-      rule('function_star' => [])
+      rule('classNaming' => 'IDENTIFIER').as 'class_name'
+      rule('class_body' => 'LEFT_BRACE methods_opt RIGHT_BRACE').as 'class_body'
+      rule('methods_opt' => 'method_plus')
+      rule('methods_opt' => [])
+      rule('method_plus' => 'method_plus function').as 'method_plus_more'
+      rule('method_plus' => 'function').as 'method_plus_end'
 
       rule('funDecl' => 'FUN function').as 'fun_decl'
 

data/lib/loxxy/version.rb

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

data/spec/interpreter_spec.rb

@@ -451,6 +451,23 @@ LOX_END
       end
       # rubocop: enable Style/StringConcatenation
 
+      it 'should support class declaration' do
+        program = <<-LOX_END
+          class Duck {
+            noise() {
+              quack();
+            }
+
+            quack() {
+              print "quack";
+            }
+          }
+          print Duck;
+        LOX_END
+        expect { subject.evaluate(program) }.not_to raise_error
+        expect(sample_cfg[:ostream].string).to eq('Duck')
+      end
+
       it 'should print the hello world message' do
         program = <<-LOX_END
           var greeting = "Hello"; // Declaring a variable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -93,6 +93,7 @@ files:
 - lib/loxxy/ast/lox_binary_expr.rb
 - lib/loxxy/ast/lox_block_stmt.rb
 - lib/loxxy/ast/lox_call_expr.rb
+- lib/loxxy/ast/lox_class_stmt.rb
 - lib/loxxy/ast/lox_compound_expr.rb
 - lib/loxxy/ast/lox_for_stmt.rb
 - lib/loxxy/ast/lox_fun_stmt.rb
@@ -113,6 +114,7 @@ files:
 - lib/loxxy/back_end/engine.rb
 - lib/loxxy/back_end/entry.rb
 - lib/loxxy/back_end/environment.rb
+- lib/loxxy/back_end/lox_class.rb
 - lib/loxxy/back_end/lox_function.rb
 - lib/loxxy/back_end/resolver.rb
 - lib/loxxy/back_end/symbol_table.rb