solidity 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7039440cfd0f451c6d990c35cdbef3a23309b86ce3c380cb4716ad9647b27f5d
-  data.tar.gz: e69c2a1a4273a5c9abc2858d5fe5a9cc27dc46656acf321e39cb520addb579c1
+  metadata.gz: 92328b174c85612323db86d1d50654934da8b46d878831b99d49086673cda0df
+  data.tar.gz: 487298452cd42474065d694a87ef23f8425371dfd8ce29742c38b38227beaade
 SHA512:
-  metadata.gz: a97fb7eeac099baf18b2045fa60351b97ac36207c68517553498c35912f4eed73727aa94d8e9b70a7b2512e9efeb865d764161fa56876c1fcac2f87782333049
-  data.tar.gz: 68abe7d1bb83abdbd5a45f6cd3303a9ff368ae87f73046a9f3d40858e4407fc4f8fb300e599aca915a68921a9d3ff286b88ae4b29746e5fcd7b2ac0d2634f324
+  metadata.gz: 18ee1772f0ea6d2c5579d955301140bf7930e3f9b94810682da34d5929c9c93c7b10f62e7781d01abe16527f54502837cd2424c773b0177c3fc767ba43734706
+  data.tar.gz: 1dcd402d83754b2bee56794fe465f02f7f874770188dffb971ff3fe34ea7aa0f084416f6a0f64508e90132d2ea03795e2f364c29f023b7f767e62d0d450a682d

data/lib/solidity/lexer.rb

@@ -43,15 +43,14 @@ class Lexer
   ## SingleQuotedStringCharacter
   ##   : ~['\r\n\\] | ('\\' .) ;
 
+  DOUBLE_QUOTE       = %r{"
+                           ( \\\\. | [^"\r\n\\] )*
+                          "}x
 
   SINGLE_QUOTE       = %r{'
-                           ( \\\\. | [^'] )*
+                           ( \\\\. | [^'\r\n\\] )*
                          '}x
 
-  DOUBLE_QUOTE       = %r{"
-                           ( \\\\. | [^"] )*
-                          "}x
-
 
   ## from the solidity grammar
   ##  > An identifier in solidity has to start with a letter,
@@ -76,40 +75,34 @@ class Lexer
   ##
   ## COMMENT
   ##   : '/*' .*? '*/'  ;
-  ##
   ## LINE_COMMENT
   ##   : '//' ~[\r\n]* ;
 
+  COMMENT = %r{/\*
+                .*?
+                \*/}x
+
+  LINE_COMMENT = %r{//
+                     [^\r\n]*}x
 
    def tokenize
      t = []
      s = StringScanner.new( @txt )
 
      until s.eos?   ## loop until hitting end-of-string (file)
-       if s.check( /[ \t]*\/\*/ )
-          ## note: auto-slurp leading (optinal) spaces!!!! - why? why not?
-          comment = s.scan_until( /\*\// )
-          ## print "multi-line comment:"
-          ## pp comment
-          t << [:comment, comment.lstrip]
-       elsif s.check( /[ \t]*\/\// )
-          ## note: auto-slurp leading (optinal) spaces!!!!  - why? why not?
-          ## note: auto-remove newline AND trailing whitespace - why? why not?
-          comment = s.scan_until( /\n|$/ ).strip
-          ## print "comment:"
-          ## pp comment
-          t << [:comment, comment]
-       elsif s.scan( /[ \t]+/ )   ## one or more spaces
+       if s.scan( /[ \t]+/ )   ## one or more spaces
           ## note: (auto-)convert tab to space - why? why not?
           t << [:sp, s.matched.gsub( /[\t]/, ' ') ]
        elsif s.scan( /\r?\n/ )    ## check for (windows) carriage return (\r) - why? why not?
           t << [:nl, "\n" ]
-       elsif s.check( "'" )   ## single-quoted string
-          str = s.scan( SINGLE_QUOTE )
-          t << [:string, str]
-       elsif s.check( '"' )  ## double-quoted string
-          str = s.scan( DOUBLE_QUOTE )
-          t << [:string, str]
+       elsif s.scan( COMMENT )
+          t << [:comment, s.matched]
+       elsif s.scan( LINE_COMMENT )
+          t << [:comment, s.matched]
+       elsif s.scan( DOUBLE_QUOTE )  ## double-quoted string
+          t << [:string, s.matched]
+       elsif s.scan( SINGLE_QUOTE )  ## single-quoted string
+          t << [:string, s.matched]
        elsif s.scan( NAME )
           name = s.matched
           case name
@@ -154,13 +147,41 @@ class Lexer
       ## note: returns type lexeme (string content) for now
       ##            and NOT token struct for now - why? why not?
       t = @tokens[@pos]
-      tt =  t.nil? || t.is_a?( String ) ? t : t[1]
+      str =  t.nil? || t.is_a?( String ) ? t : t[1]
       @pos += 1      unless t.nil?
-      tt
+      str
    end
    def eos?()  peek().nil?; end
 
 
 
+
+   #################################################
+   #  "higher-level" helpers
+   def scan_until( tt, include: false )
+      code = String.new('')
+      while (peek=self.peek) != tt do
+         ## note:  turn inline comments into a single space
+         code <<   if peek == :comment
+                       self.next   ## note: next (w/o self) is parsed as keyword
+                       ' '
+                   else
+                       self.next  ## note: next (w/o self) is parsed as keyword
+                   end
+      end
+      code << self.next       if include  ## include ';' too - why? why not?
+      code = _norm_whitespace( code )
+      code
+   end
+
+   def _norm_whitespace( str )
+      ## change newlines to spaces and
+      ##   all multiple spaces to one
+      str = str.gsub( /[ \t\n\r]+/, ' ' )
+      str.strip
+   end
+
+
+
 end  # class Lexer
 end  # module Solidity

data/lib/solidity/parser.rb

@@ -17,66 +17,40 @@ class Parser
 
 
 
-   def _scan_until( lex, tt, include: false )
-      code = String.new('')
-      while (peek=lex.peek) != tt do
-         ## note:  turn inline comments into a single space
-         code <<   if peek == :comment
-                       lex.next
-                       ' '
-                   else
-                        lex.next
-                   end
-      end
-      code << lex.next     if include  ## include ';' too - why? why not?
-      code = _norm_whitespace( code )
-      code
-   end
-
-   def _norm_whitespace( str )
-      ## change newlines to spaces and
-      ##   all multiple spaces to one
-      str = str.gsub( /[ \t\n\r]+/, ' ' )
-      str.strip
-   end
-
-
    def _quick_pass_one
      tree = []
 
      lex = Lexer.new( @txt )
 
      until lex.eos?
-       while lex.peek == :sp do   ## note: do NOT skip newlines here; pass along blank/empty lines for now - why? why not?
-           lex.next
-       end
-
        case lex.peek
        when :comment  ## single or multi-line comment
            tree << [:comment, lex.next]
+           ## note:  if next token is newline - slurp / ignore
+           lex.next    if lex.peek == :nl
        when :pragma
-            code = _scan_until( lex, :';',
-                                 include: true )
+            code = lex.scan_until( :';',
+                                   include: true )
              ## print "pragma:"
              ## pp code
              tree << [:pragma, code]
        when :contract
-             code = _scan_until( lex, :'{' )
+             code = lex.scan_until( :'{' )
              ## print "contract:"
              ## pp code
              tree << [:contract, code]
        when :abstract
-             code = _scan_until( lex, :'{' )
+             code = lex.scan_until( :'{' )
              ## print "abstract contract:"
              ## pp code
              tree << [:abstract_contract, code]
        when :library
-             code = _scan_until( lex, :'{' )
+             code = lex.scan_until( :'{' )
              ## print "library:"
              ## pp code
              tree << [:library, code]
        when :interface
-             code = _scan_until( lex, :'{' )
+             code = lex.scan_until( :'{' )
              ## print "interface:"
              ## pp code
              tree << [:interface, code]

data/lib/solidity/version.rb

@@ -1,8 +1,8 @@
 
 module Solidity
   MAJOR = 0
-  MINOR = 1
-  PATCH = 5
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidity
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos