tcepsni 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d6d7256e483e7259f7ca6a630969fdea2b00a94674130f33af6fc8992d50e1
-  data.tar.gz: a4c891f49b92e1fa79fc36759665357eb47e5de1fe774f6a9e4c6c1e904d2a89
+  metadata.gz: f68a9bde443479e50e62f0f201a17c986eaad09e686e48adb24fa6a600ce38cb
+  data.tar.gz: 2e718d175261eb10ded9c3fbcad4926b6c98e5072d0a81d148aa1f40c6f04571
 SHA512:
-  metadata.gz: 584b8d5ca524b82d8b1ff0e0ba04a8b76768c9ca64488699f2ad737bf337790c50fc9c938bdad75fe0630480b24c125bff80629e820e26a556c11d13e599463b
-  data.tar.gz: 678dd3a11bdcaacc47f7a26d545dd5b4466b2e1f471b4b8f233c23c816658c25bc01a1c0bae2b688eb411f68518718fe571863917bccc108b8fa51b230d6da3d
+  metadata.gz: 232ff2963d9bca49cea25eb7cc90bc6fc08815808058289e61b6ffae5dc8ee1516b43a2d56b64fde23c707034b7d1d1c068c417fc66a1e21503327f32237d5bb
+  data.tar.gz: aadf113b5b26b20fc9d648ead1b43bf29f1c48eddd977348f0ef195af98dc0ab5fed4654dfd79a7b4f3009411b47a3d97e4834143c3ee99f6dab0b724300135c

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.1.1 - 2023-10-02
+
+### Changed
+
+- Object's memory reference attribute has changed to integer from string
+
+### Fixed
+
+- String scanner parser now supports string with quotes
+
 ## 0.1.0 - 2023-10-01
 
 - Initial release

data/lib/tcepsni/version.rb

@@ -1,3 +1,3 @@
 module Tcepsni
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/tcepsni.rb

@@ -12,32 +12,41 @@ module Tcepsni
   class << self
     private
 
+    # If it returned nil when failed, it collides with normal nil value.
     def parse_expression(scanner)
-      if (integer = scanner.scan(/\d+/))
-        Integer(integer)
-      elsif scanner.skip('nil')
+      if scanner.skip('nil')
         nil
       elsif scanner.skip('true')
         true
       elsif scanner.skip('false')
         false
-      elsif scanner.skip(/:(?<name>[A-Za-z_][A-Za-z0-9_]*)/)
-        scanner[:name].intern
+      elsif scanner.skip(':')
+        parse_identifier(scanner)
       elsif scanner.skip('"')
         parse_string(scanner)
       elsif scanner.skip('[')
         parse_array(scanner)
       elsif scanner.skip('{')
         parse_hash(scanner)
-      elsif (name = scanner.scan(/[A-Z][A-Za-z0-9_]*/))
-        parse_class(scanner, name: name.intern)
       elsif scanner.skip('#<')
         parse_object(scanner)
       else
-        raise Error, "invalid format: #{ scanner.inspect }"
+        parse_integer(scanner) or parse_class(scanner)
       end
     end
 
+    # Returns nil if it's not integer.
+    # This doesn't raise error for convenience.
+    def parse_integer(scanner)
+      int = scanner.scan(/\d+/) or return
+      Integer(int)
+    end
+
+    def parse_identifier(scanner)
+      id = scanner.scan(/[A-Za-z_][A-Za-z0-9_]*/) or raise Error, 'no identifier'
+      id.intern
+    end
+
     def parse_string(scanner)
       result = ''
       until scanner.eos?
@@ -76,37 +85,45 @@ module Tcepsni
       result
     end
 
-    def parse_class(scanner, name: nil)
-      unless name
-        name = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, 'no class name'
-        name = name.intern
-      end
-      namespaces = [name]
+    def parse_class(scanner)
+      namespaces = [parse_capitalized_identifier(scanner)]
       until scanner.eos?
         scanner.skip('::') or break
         scanner.eos? and raise Error, 'incomplete class'
-        namespace = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, 'no namespace'
-        namespaces << namespace.intern
+        namespaces << parse_capitalized_identifier(scanner)
       end
       *namespaces, name = namespaces
       Tcepsni::Class.new(name: name, namespaces: namespaces)
     end
 
+    def parse_capitalized_identifier(scanner)
+      id = scanner.scan(/[A-Z][A-Za-z0-9_]*/) or raise Error, 'no capitalized identifier'
+      id.intern
+    end
+
     def parse_object(scanner)
       klass = parse_class(scanner)
       if klass.string_scanner?
-        scanner.skip(%r{ (?<pos>\d+)/(?<total>\d+) "(?<scanned>[^"]+)" @ "(?<rest>[^"]+)">}) or raise Error, 'invalid string scanner'
-        Tcepsni::StringScanner.new(pos: Integer(scanner[:pos]), total: Integer(scanner[:total]), scanned: scanner[:scanned], rest: scanner[:rest])
+        scanner.skip(' ') or raise Error, 'no space after string scanner class name'
+        pos = parse_integer(scanner) or raise Error, 'no string scanner pos'
+        scanner.skip('/') or raise Error, 'no string scanner progress delimiter slash'
+        total = parse_integer(scanner) or raise Error, 'no string scanner total size'
+        scanner.skip(' "') or raise Error, 'no space after string scanner progress'
+        scanned = parse_string(scanner)
+        scanner.skip(' @ "') or raise Error, "no string scanner mark in string: #{scanner.inspect}"
+        rest = parse_string(scanner)
+        scanner.skip('>') or raise Error, 'no string scanner closer'
+        Tcepsni::StringScanner.new(pos: pos, total: total, scanned: scanned, rest: rest)
       else
         scanner.skip(/:(?<memory_reference>0x[0-9a-f]{16})/) or raise Error, "no memory reference: #{scanner.inspect}"
-        memory_reference = scanner[:memory_reference]
+        memory_reference = Integer(scanner[:memory_reference])
         attributes = {}
         unless scanner.skip('>')
           until scanner.eos?
-            scanner.skip(/ @(?<key>[A-Za-z_][A-Za-z_0-9]*)=/) or break
-            key = scanner[:key].intern
-            value = parse_expression(scanner)
-            attributes[key] = value
+            scanner.skip(' @') or break
+            key = parse_identifier(scanner)
+            scanner.skip('=') or raise Error, 'no attribute keyval equal char'
+            attributes[key.intern] = parse_expression(scanner)
             scanner.skip(',') or break
           end
         end

data/sig/tcepsni.gen.rbs

@@ -6,10 +6,13 @@ module Tcepsni
 
 # def self.parse: (String str) -> parsed
   def self.parse_expression: (untyped scanner) -> ((Array[(Array[(Class | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Class | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[(Class | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Class | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?)
+  def self.parse_integer: (untyped scanner) -> Integer?
+  def self.parse_identifier: (untyped scanner) -> untyped
   def self.parse_string: (untyped scanner) -> String
   def self.parse_array: (untyped scanner) -> (Array[(Array[(Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?])
   def self.parse_hash: (untyped scanner) -> (Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[(Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, (Array[untyped] | Class | Hash[(Class | Integer | Object | String | StringScanner | bool)?, untyped] | Integer | Object | String | StringScanner | bool)?] | Integer | Object | String | StringScanner | bool)?])
-  def self.parse_class: (untyped scanner, ?name: nil) -> Class
+  def self.parse_class: (untyped scanner) -> Class
+  def self.parse_capitalized_identifier: (untyped scanner) -> untyped
   def self.parse_object: (untyped scanner) -> (Object | StringScanner)
 
   class Class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tcepsni
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gemmaro
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: inspected Ruby objects parser