loxxy 0.3.02 → 0.3.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e398714d64763c288f06c315611c86bf3dae2e3403055ae3ca240a10bd292f
-  data.tar.gz: 8db95e837824181e1794277dc3e67e4005432006877124bbd62ffd07def57591
+  metadata.gz: 734fc040d2487c17abd8d89d4f3422e4d55db226ef79b354e52402fc24cd61fc
+  data.tar.gz: e799c5d1044159e9bfdc1b337c370e95878c85752dcaaf60578e71c4763a7da1
 SHA512:
-  metadata.gz: caf2aab9a8c03997fbde67467b7cb66a786c2fb8ef46fc24869c42ac7da76831f5e771a282c938ec83585666de801602ffc9818fc489454ec93dec9bd76bf5a7
-  data.tar.gz: 9d98db7d9bddec915929dc1cbaed057248ccb5e0cc63efc3d0d7e99536ea9b330925d91d6b1ffd6805194dc3805b0025228f66d11f11b5455cb8f52d7753e6eb
+  metadata.gz: d6d393729d977e6493979f4e89c664a1bba685b08c67a5e9e9b0d12354ac552deadae4e15a213560b752bdb9b44c7a05a5652fc8b4ed6500409fa04fe3cf29c1
+  data.tar.gz: f3b121e4a5ca07b4297aca8c43a3325b00dd30fb131f412a17a5e82d7887e8fc8749a2e1a422c75fe0c1045652970a121a78883b06c6bbc6baa6d896b0fea03f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.3.03] - 2021-05-23
+- Fixes in the location of an undefined variable. Rewrite of the scanning of lox string.
+
+### Changed
+-  Method `BackEnd::Engine#after_variable_expr` the error message `Undefined variable` nows gives the location of the offending variable.
+- Class `FrontEnd#Scanner` complete refactoring of String recognition.
+
+### Fixed
+- Method `Ast::AstBuilder#reduce_variable_expr` now associates the correct location of the variable.
+
 ## [0.3.02] - 2021-05-22
 - New built-in expressions `getc`, `chr`, `exit` and `print_eeror` , fixes with deeply nested returns, set expressions
 

data/lib/loxxy/ast/ast_builder.rb

@@ -395,9 +395,10 @@ module Loxxy
       end
 
       # rule('primary' => 'IDENTIFIER')
-      def reduce_variable_expr(_production, _range, tokens, theChildren)
+      def reduce_variable_expr(_production, _range, _tokens, theChildren)
         var_name = theChildren[0].token.lexeme
-        LoxVariableExpr.new(tokens[0].position, var_name)
+        pos = theChildren[0].token.position
+        LoxVariableExpr.new(pos, var_name)
       end
 
       # rule('primary' => 'THIS')

data/lib/loxxy/back_end/engine.rb

@@ -326,7 +326,10 @@ module Loxxy
       def after_variable_expr(aVarExpr, aVisitor)
         var_name = aVarExpr.name
         var = variable_lookup(aVarExpr)
-        raise Loxxy::RuntimeError, "Undefined variable '#{var_name}'." unless var
+        unless var
+          pos = "line #{aVarExpr.position.line}:#{aVarExpr.position.column}"
+          raise Loxxy::RuntimeError, "[#{pos}] Undefined variable '#{var_name}'."
+        end
 
         var.value.accept(aVisitor) # Evaluate variable value then push on stack
       end

data/lib/loxxy/datatype/lx_string.rb

@@ -47,11 +47,10 @@ module Loxxy
 
       def validated_value(aValue)
         unless aValue.is_a?(String)
-          raise StandardError, "Invalid number value #{aValue}"
+          raise StandardError, "Invalid string value #{aValue}"
         end
 
-        # Remove double quotes delimiter
-        aValue.gsub(/(^")|("$)/, '')
+        aValue
       end
     end # class
   end # module

data/lib/loxxy/front_end/scanner.rb

@@ -61,6 +61,20 @@ module Loxxy
         print return super this true var while
       ].map { |x| [x, x] }.to_h
 
+      # Single character that have a special meaning when escaped
+      # @return [{Char => String}]
+      @@escape_chars = {
+        ?a => "\a",
+        ?b => "\b",
+        ?e => "\e",
+        ?f => "\f",
+        ?n => "\n",
+        ?r => "\r",
+        ?s => "\s",
+        ?t => "\t",
+        ?v => "\v"
+      }.freeze
+
       # Constructor. Initialize a tokenizer for Lox input.
       # @param source [String] Lox text to tokenize.
       def initialize(source = nil)
@@ -104,18 +118,14 @@ module Loxxy
         elsif (lexeme = scanner.scan(/[!=><]=?/))
           # One or two special character tokens
           token = build_token(@@lexeme2name[lexeme], lexeme)
+        elsif scanner.scan(/"/) # Start of string detected...
+          token = build_string_token
         elsif (lexeme = scanner.scan(/\d+(?:\.\d+)?/))
           token = build_token('NUMBER', lexeme)
-        elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/))
-          token = build_token('STRING', lexeme)
         elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z_0-9]*/))
           keyw = @@keywords[lexeme]
           tok_type = keyw ? keyw.upcase : 'IDENTIFIER'
           token = build_token(tok_type, lexeme)
-        elsif scanner.scan(/"(?:\\"|[^"])*\z/)
-          # Error: unterminated string...
-          col = scanner.pos - @line_start + 1
-          raise ScanError, "Error: [line #{lineno}:#{col}]: Unterminated string."
         else # Unknown token
           col = scanner.pos - @line_start + 1
           _erroneous = curr_ch.nil? ? '' : scanner.scan(/./)
@@ -153,8 +163,6 @@ module Loxxy
             value = Datatype::Nil.instance
           when 'NUMBER'
             value = Datatype::Number.new(aLexeme)
-          when 'STRING'
-            value = Datatype::LXString.new(unescape_string(aLexeme))
           when 'TRUE'
             value = Datatype::True.instance
           else
@@ -164,27 +172,47 @@ module Loxxy
         return [value, symb]
       end
 
-      # Replace any sequence sequence by their "real" value.
-      def unescape_string(aText)
-        result = +''
-        previous = nil
-
-        aText.each_char do |ch|
-          if previous
-            if ch == ?n
-              result << "\n"
-            else
-              result << ch
-            end
-            previous = nil
-          elsif ch == '\\'
-            previous = ?\
+      # precondition: current position at leading quote
+      def build_string_token
+        scan_pos = scanner.pos
+        line = @lineno
+        column_start = scan_pos - @line_start
+        literal = +''
+        loop do
+          substr = scanner.scan(/[^"\\\r\n]*/)
+          if scanner.eos?
+            pos_start = "line #{line}:#{column_start}"
+            raise ScanError, "Error: [#{pos_start}]: Unterminated string."
           else
-            result << ch
+            literal << substr
+            special = scanner.scan(/["\\\r\n]/)
+            case special
+            when '"' # Terminating quote found
+              break
+            when "\r"
+              next_line
+              special << scanner.scan(/./) if scanner.match?(/\n/)
+              literal << special
+            when "\n"
+              next_line
+              literal << special
+            when '\\'
+              ch = scanner.scan(/./)
+              next unless ch
+
+              escaped = @@escape_chars[ch]
+              if escaped
+                literal << escaped
+              else
+                literal << ch
+              end
+            end
           end
         end
-
-        result
+        pos = Rley::Lexical::Position.new(line, column_start)
+        lox_string = Datatype::LXString.new(literal)
+        lexeme = scanner.string[scan_pos - 1..scanner.pos - 1]
+        Literal.new(lox_string, lexeme, 'STRING', pos)
       end
 
       # Skip non-significant whitespaces and comments.

data/lib/loxxy/version.rb

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

data/spec/front_end/scanner_spec.rb

@@ -211,22 +211,25 @@ LOX_END
         end
 
         it 'should recognize escaped quotes' do
-          embedded_quotes = %q{she said: \"Hello\"}
-          result = subject.send(:unescape_string, embedded_quotes)
-          expect(result).to eq('she said: "Hello"')
+          embedded_quotes = %q{"she said: \"Hello\""}
+          subject.start_with(embedded_quotes)
+          result = subject.tokens[0]
+          expect(result.value).to eq('she said: "Hello"')
         end
 
         it 'should recognize escaped backslash' do
-          embedded_backslash = 'backslash>\\\\'
-          result = subject.send(:unescape_string, embedded_backslash)
-          expect(result).to eq('backslash>\\')
+          embedded_backslash = '"backslash>\\\\"'
+          subject.start_with(embedded_backslash)
+          result = subject.tokens[0]
+          expect(result.value).to eq('backslash>\\')
         end
 
         # rubocop: disable Style/StringConcatenation
         it 'should recognize newline escape sequence' do
-          embedded_newline = 'line1\\nline2'
-          result = subject.send(:unescape_string, embedded_newline)
-          expect(result).to eq('line1' + "\n" + 'line2')
+          embedded_newline = '"line1\\nline2"'
+          subject.start_with(embedded_newline)
+          result = subject.tokens[0]
+          expect(result.value).to eq('line1' + "\n" + 'line2')
         end
         # rubocop: enable Style/StringConcatenation
 
@@ -289,7 +292,7 @@ LOX_END
         it 'should complain if it finds an unterminated string' do
           subject.start_with('var a = "Unfinished;')
           err = Loxxy::ScanError
-          err_msg = 'Error: [line 1:21]: Unterminated string.'
+          err_msg = 'Error: [line 1:9]: Unterminated string.'
           expect { subject.tokens }.to raise_error(err, err_msg)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loxxy
 version: !ruby/object:Gem::Version
-  version: 0.3.02
+  version: 0.3.03
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley