vinter 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f99b1ca16b7bbca35229a549ceed21f3cdf9b8bc86a3fedff9b978b18717de
-  data.tar.gz: 2aa4e1df5ae4fc08e78c06cf2107c7192099326b073bf45e45a9532b3fb5d0c3
+  metadata.gz: 617e3da0fed64bcf718e3c1e3bd82a66e910e4a2099a27942a2390c93421779b
+  data.tar.gz: a54306cbf4b2e25921c3518985acb0d648096a66e1f24a86e59ac3aa53d56810
 SHA512:
-  metadata.gz: d739b01780f6ce12654b09b701f343e850bd2eb750e705ca608f793e7e9cfef26b226927157ff595dcbb3f62ddbbd4f530439074ef9fdbc9a2cfd075dd78a3da
-  data.tar.gz: 7ec3181349383a4b9667aab046f56099d25f830a07aaa6a6135b8640a25d59e85c2191b3ffbecd263afe703f1f17a986f40f769e458bab532e70f837f9c9a029
+  metadata.gz: 614e2e7ef3f02f16a8888069c40244761a7c3afb142b84aafb410c39693e25d4e3d9afa9e4a8bafea24512dc9b339364bf8e0ace1a665d424d0f638428d4b7f9
+  data.tar.gz: 8ace7e570a66a113e66c411d5725f1a72fc3596faffcda899e3590b37b7893aaff21aeefc4d1e1e60fa2cc20f830377417c493b88af4ab90f126f72b843ee521

data/lib/vinter/ast_printer.rb

@@ -0,0 +1,14 @@
+module Vinter
+  module ASTPrinter
+    def self.print(ast, indent=0)
+      spaces = " " * indent * 2
+      ast[:body].each do |node|
+        puts "#{spaces}(#{node[:type]}|#{node[:value]})"
+        if node[:type] == :export_statement
+          puts "(#{node[:export][:type]})"
+          print(node[:export], indent=1)
+        end
+      end
+    end
+  end
+end

data/lib/vinter/lexer.rb

@@ -2,7 +2,10 @@ module Vinter
   class Lexer
     TOKEN_TYPES = {
       # Vim9 specific keywords
-      keyword: /\b(if|else|elseif|endif|while|endwhile|for|endfor|def|enddef|function|endfunction|endfunc|return|const|var|final|import|export|class|extends|static|enum|type|vim9script|abort|autocmd|echom|echoerr|echohl|echomsg|let|unlet|execute|exec|continue|break|try|catch|finally|endtry|throw|runtime|silent|delete|command|call|set|setlocal|syntax|highlight|sleep|source|nnoremap|nmap|inoremap|imap|vnoremap|vmap|xnoremap|xmap|cnoremap|cmap|noremap|map)\b/,
+      keyword: /\b(if|else|elseif|endif|while|endwhile|for|endfor|def|enddef|function|endfunction|endfunc|return|const|var|final|import|export|class|extends|static|enum|type|vim9script|scriptencoding|abort|autocmd|echom|echoerr|echohl|echomsg|let|unlet|execute|exec|continue|break|try|catch|finally|endtry|throw|runtime|silent|delete|command|call|set|setlocal|syntax|sleep|source|nnoremap|nmap|inoremap|imap|vnoremap|vmap|xnoremap|xmap|cnoremap|cmap|noremap|map|var)\b/,
+      encodings: /\b(latin1|iso|koi8|macroman|cp437|cp737|cp775|cp850|cp852|cp855|cp857|cp860|cp861|cp862|cp863|cp865|cp866|cp869|cp874|cp1250|cp1251|cp1253|cp1254|cp1255|cp1256|cp1257|cp1258|cp932|euc\-jp|sjis|cp949|euc\-kr|cp936|euc\-cn|cp950|big5|euc\-tw|utf\-8|ucs\-2|ucs\-21e|utf\-16|utf\-16le|ucs\-4|ucs\-4le|ansi|japan|korea|prc|chinese|taiwan|utf8|unicode|ucs2be|ucs\-2be|ucs\-4be|utf\-32|utf\-32le)\b/,
+      vimfuncs: /\b(win_execute|win_findbuf|win_getid|win_gettype|win_gotoid|win_id2tabwin|win_id2win|win_move_separator|win_move_statusline|win_screenpos|win_splitmove|setbufline)\b/,
+      builtin_funcs: /\b(highlight|hi|exe|normal!|normal)\b/,
       # Identifiers can include # and special characters
       identifier: /\b[a-zA-Z_][a-zA-Z0-9_#]*\b/,
       # Single-character operators
@@ -26,7 +29,7 @@ module Vinter
       comma: /,/,
       backslash: /\\/,
       question_mark: /\?/,
-      command_separator: /\|/,
+      command_separator: /\|/
     }
 
     CONTINUATION_OPERATORS = %w(. .. + - * / = == ==# ==? != > < >= <= && || ? : -> =>)
@@ -41,21 +44,21 @@ module Vinter
     def should_parse_as_regex
       # Look at recent tokens to determine if we're in a regex context
       recent_tokens = @tokens.last(3)
-      
+
       # Check for contexts where regex is expected
-      return true if recent_tokens.any? { |t| 
-        t && t[:type] == :keyword && ['syntax'].include?(t[:value]) 
+      return true if recent_tokens.any? { |t|
+        t && t[:type] == :keyword && ['syntax'].include?(t[:value])
       }
-      
+
       return true if recent_tokens.any? { |t|
         t && t[:type] == :identifier && ['match', 'region', 'keyword'].include?(t[:value])
       }
-      
+
       # Check for comparison operators that often use regex
       return true if recent_tokens.any? { |t|
         t && t[:type] == :operator && ['=~', '!~', '=~#', '!~#', '=~?', '!~?'].include?(t[:value])
       }
-      
+
       false
     end
 
@@ -85,7 +88,7 @@ module Vinter
           end
           line_start = temp_pos < 0 || @input[temp_pos] == "\n"
         end
-        
+
         # If we're at the start of a line and it begins with a quote
         if line_start && chunk.start_with?('"')
           # Find the end of the line
@@ -103,44 +106,125 @@ module Vinter
           @column += comment_text.length
           next
         end
+
+        # --- Interpolated String Handling ---
+        if chunk.start_with?("$'")
+          i = 2
+          string_value = "$'"
+          brace_depth = 0
+          escaped = false
+
+          while i < chunk.length
+            char = chunk[i]
+            string_value += char
+
+            if char == '\\' && !escaped
+              escaped = true
+            elsif char == "'" && !escaped && brace_depth == 0
+              # End of interpolated string
+              i += 1
+              break
+            elsif char == '{' && !escaped
+              brace_depth += 1
+            elsif char == '}' && !escaped && brace_depth > 0
+              brace_depth -= 1
+            elsif escaped
+              escaped = false
+            end
+
+            i += 1
+          end
+
+          @tokens << {
+            type: :interpolated_string,
+            value: string_value,
+            line: @line_num,
+            column: @column
+          }
+          @column += string_value.length
+          @position += string_value.length
+          @line_num += string_value.count("\n")
+          next
+        end
+
+        # XXX: i dont like this not being combined with $' condition above
+        if chunk.start_with?('$"')
+          i = 2
+          string_value = '$"'
+          brace_depth = 0
+          escaped = false
+
+          while i < chunk.length
+            char = chunk[i]
+            string_value += char
+
+            if char == '\\' && !escaped
+              escaped = true
+            elsif char == '"' && !escaped && brace_depth == 0
+              # End of interpolated string
+              i += 1
+              break
+            elsif char == '{' && !escaped
+              brace_depth += 1
+            elsif char == '}' && !escaped && brace_depth > 0
+              brace_depth -= 1
+            elsif escaped
+              escaped = false
+            end
+
+            i += 1
+          end
+
+          @tokens << {
+            type: :interpolated_string,
+            value: string_value,
+            line: @line_num,
+            column: @column
+          }
+          @column += string_value.length
+          @position += string_value.length
+          @line_num += string_value.count("\n")
+          next
+        end
+
         # Handle string literals manually
         if chunk.start_with?("'") || chunk.start_with?('"')
           quote = chunk[0]
           i = 1
-          escaped = false
           string_value = quote
 
           # Keep going until we find an unescaped closing quote
           while i < chunk.length
             char = chunk[i]
+            next_char = chunk[i + 1] if i + 1 < chunk.length
+
             string_value += char
 
-            if char == '\\' && !escaped
-              escaped = true
-            elsif (char == "\n" or char == quote) && !escaped
-              # Found closing quote
+            if char == quote && next_char == quote
+              # Handle escaped single quote ('') or double quote ("")
+              string_value += next_char
+              i += 1
+            elsif char == quote
+              # End of string
+              i += 1
               break
-            elsif escaped
-              escaped = false
             end
 
             i += 1
           end
 
           # Add the string token if we found a closing quote
-          if i < chunk.length || (i == chunk.length && chunk[-1] == quote)
-            @tokens << {
-              type: :string,
-              value: string_value,
-              line: @line_num,
-              column: @column
-            }
+          @tokens << {
+            type: :string,
+            value: string_value,
+            line: @line_num,
+            column: @column
+          }
 
-            @column += string_value.length
-            @position += string_value.length
-            @line_num += 1 if string_value.include?("\n")
-            next
-          end
+          @column += string_value.length
+          @position += string_value.length
+          @line_num += string_value.count("\n")
+          next
         end
 
         # Add special handling for command options in the tokenize method
@@ -186,7 +270,7 @@ module Vinter
         end
 
         # Check for keywords first, before other token types
-        if match = chunk.match(/\A\b(if|else|elseif|endif|while|endwhile|for|endfor|def|enddef|function|endfunction|endfunc|return|const|var|final|import|export|class|extends|static|enum|type|vim9script|abort|autocmd|echoerr|echohl|echomsg|let|unlet|execute|setlocal|syntax|highlight|sleep|source)\b/)
+        if match = chunk.match(/\A\b(if|else|elseif|endif|while|endwhile|for|endfor|def|enddef|function|endfunction|endfunc|return|const|var|final|import|export|class|extends|static|enum|type|vim9script|abort|autocmd|echoerr|echohl|echomsg|let|unlet|var|execute|setlocal|syntax|highlight|sleep|source)\b/)
           @tokens << {
             type: :keyword,
             value: match[0],
@@ -210,7 +294,7 @@ module Vinter
           @position += match[0].length
           next
         end
-        
+
         # Handle Vim option variables with & prefix
         if match = chunk.match(/\A&[a-zA-Z_][a-zA-Z0-9_]*/)
           @tokens << {
@@ -330,7 +414,7 @@ module Vinter
         end
 
         # Add support for standalone namespace prefixes (like g:)
-        if match = chunk.match(/\A([sgbwtal]):/)
+        if match = chunk.match(/\A([gbwt]):/)
           @tokens << {
             type: :namespace_prefix,
             value: match[0],
@@ -385,21 +469,21 @@ module Vinter
         if chunk.start_with?('/') && should_parse_as_regex
           i = 1
           regex_value = '/'
-          
+
           # Keep going until we find the closing slash
           while i < chunk.length
             char = chunk[i]
             regex_value += char
-            
+
             if char == '/' && (i == 1 || chunk[i-1] != '\\')
               # Found closing slash
               i += 1
               break
             end
-            
+
             i += 1
           end
-          
+
           # Add the regex token if we found a closing slash
           if regex_value.end_with?('/')
             @tokens << {
@@ -442,8 +526,7 @@ module Vinter
         end
 
         # In the tokenize method, add special handling for common mapping components
-        if chunk.start_with?('<CR>', '<Esc>', '<Tab>', '<Space>', '<C-') ||
-           (chunk =~ /\A<[A-Za-z0-9\-_]+>/)
+        if chunk.start_with?('<CR>', '<Esc>', '<Tab>', '<Space>', '<C-')
           # Extract the special key notation
           match = chunk.match(/\A(<[^>]+>)/)
           if match
@@ -486,13 +569,24 @@ module Vinter
           @column += 1
           @position += 1
 
-          # If followed by a newline, advance to next line
+          # If followed by a newline, advance to the next line
           if @position < @input.length && @input[@position] == "\n"
             @line_num += 1
             @column = 1
             @position += 1
           end
 
+          # Skip whitespace after the continuation
+          while @position < @input.length && @input[@position] =~ /\s/
+            if @input[@position] == "\n"
+              @line_num += 1
+              @column = 1
+            else
+              @column += 1
+            end
+            @position += 1
+          end
+
           next
         end