cast-to-yaml 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8524dd3e090d0b7183a64d0211cb576e323335ef7f74c796bf9b782d6878d0
-  data.tar.gz: 6d477343c3f14724045a5630f755a6f00b67a0b30c2fcd5056ecda1b3fa6db26
+  metadata.gz: be1314489cac42f6fdc88072ecd2c9d18f3ffb9b938a91a4877d64f492b82ab4
+  data.tar.gz: a2d1171413f5219ea3f99a62e1e706fe7173ea9ddd7850a77e4a594a99009aee
 SHA512:
-  metadata.gz: c285dfe327f870bf4d5d9da514f9211784dbc3d613fb6e3fe5fbc3443bfcf02426925df7fceb670ea2e40adc7447fba126e8a72daad88d2e1b524467628cc758
-  data.tar.gz: e9fb38a6ea74eb661e681f3d5282898cbba31b244db2b8530d1069ff09e657ed69b29f6fe910ceee38e474b9067c48518b99d1c35378f0296d5d6a69bb2accfc
+  metadata.gz: c31c63132a199291668840678b8007cab4f3ba9c6303cdded9c7e8cca1e17b923121216c0096815ba92beb422f53c634c3ca0b5cb8a11cfc5db8a3fd762f8755
+  data.tar.gz: 33184e329313552a6661f387bc9d679efac14e44a7b8ece742961c819a9fe980245ab49732d0e1bc8bd88414ffd110ce02c6b63be585ac681127b1adfc7f6ce8

data/cast-to-yaml.gemspec

@@ -1,12 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'cast-to-yaml'
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.author = "Brice Videau"
   s.email = "bvideau@anl.gov"
   s.homepage = "https://github.com/alcf-perfengr/cast-to-yaml"
   s.summary = "Extract information fom a c ast"
   s.files = Dir[ 'cast-to-yaml.gemspec', 'LICENSE', 'lib/**/*.rb' ]
-  s.has_rdoc = false
   s.license = 'MIT'
   s.required_ruby_version = '>= 2.3.0'
   s.add_dependency 'cast', '~> 0.3', '>=0.3.0'

data/lib/cast-to-yaml.rb

@@ -1,2 +1,3 @@
 require 'cast'
+require_relative 'cast-to-yaml/to_h'
 require_relative 'cast-to-yaml/to_yaml'

data/lib/cast-to-yaml/to_h.rb

@@ -0,0 +1,85 @@
+module C
+
+  class Node
+
+    #
+    # Serialize a node to a Hash representation.
+    #
+    def to_h
+      res = {}
+      kind = self.class.kind
+      res["kind"] = kind
+      fields.each do |f|
+        name = f.init_key.to_s
+        value = self.send(f.reader)
+        if value && !(value == f.make_default)
+          res[name] =
+            if f.child?
+              if value.kind_of? C::NodeList
+                value.collect { |n| n.to_h }
+              else
+                value.to_h
+              end
+            else
+              value
+            end
+        end
+      end
+      return res
+    end
+
+    private
+
+    def self.kind
+      @kind ||= name.split('::').last.
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+    end
+
+    #
+    # Deserialize a node from a given Hash representation.
+    #
+    def self.from_h(h)
+      params = {}
+      fields.each do |f|
+        name = f.init_key
+        value = h[name.to_s]
+        if value
+          params[name] =
+            if f.child?
+              default = f.make_default
+              if default.kind_of?(C::NodeList) || value.kind_of?(::Array)
+                raise ArgumentError, "node is not a list" unless value.kind_of? ::Array
+                default = C::NodeArray.new unless default
+                default.push(*(value.collect { |c| C.from_h(c) }))
+              else
+                C.from_h(value)
+              end
+            else
+              value
+            end
+        end
+      end
+      return self.new(params)
+    end
+
+  end
+
+  #
+  # Deserialize an AST from a given Hash representation.
+  #
+  def self.from_h(h)
+    kind = h["kind"]
+    raise ArgumentError, "missing node kind" unless kind
+    klass = C.const_get(class_name_from_kind(kind))
+    raise ArgumentError, "unknown node" unless klass
+    return klass.send(:from_h, h)
+  end
+
+  private
+
+  def self.class_name_from_kind(kind)
+    kind.split("_").collect(&:capitalize).join
+  end
+
+end

data/lib/cast-to-yaml/to_yaml.rb

@@ -1,13 +1,40 @@
 module C
 
+  class Node
+
+    def to_h_split
+      res = {}
+      kind = self.class.kind
+      res["kind"] = kind
+      fields.each do |f|
+        name = f.init_key.to_s
+        value = self.send(f.reader)
+        if value && !(value == f.make_default)
+          res[name] =
+            if f.child?
+              if value.kind_of? C::NodeList
+                value.collect { |n| n.to_h_split }
+              else
+                value.to_h_split
+              end
+            else
+              value
+            end
+        end
+      end
+      return res
+    end
+
+  end
+
   class Declarator
-    def to_h(declaration)
+    def to_h_split(declaration)
       res = {}
       res["name"] = name.dup
       res["type"] = if indirect_type
-          indirect_type.to_h(declaration)
+          indirect_type.to_h_split(declaration)
         else
-          declaration.type.to_h
+          declaration.type.to_h_split
         end
       if init
         res["init"] = init.to_s
@@ -23,14 +50,17 @@ module C
 
     def to_a
       declarators.collect { |d|
-        d.to_h(self)
+        res = d.to_h_split(self)
+        res["storage"] = storage.to_s if storage
+        res["inline"] = true if inline?
+        res
       }
     end
 
-    def extract(res = Hash::new { |h, k| h[k] = [] })
+    def extract(res = Hash::new { |h, k| h[k] = [] }, declarations: true)
       if typedef?
         declarators.each { |d|
-          res["typedefs"].push d.to_h(self)
+          res["typedefs"].push d.to_h_split(self)
         }
       else
         declarators.each { |d|
@@ -38,17 +68,29 @@ module C
             f = {}
             f["name"] = d.name
             if d.indirect_type.type
-              f["type"] = d.indirect_type.type.to_h(self)
+              f["type"] = d.indirect_type.type.to_h_split(self)
             else
-              f["type"] = type.to_h(self)
+              f["type"] = type.to_h_split(self)
             end
             if d.indirect_type.params
-              f["params"] = d.indirect_type.params.collect { |p| p.to_h }
+              f["params"] = d.indirect_type.params.collect { |p| p.to_h_split }
+            end
+            if d.indirect_type.var_args?
+              f["var_args"] = true
+            end
+            if inline?
+              f["inline"] = true
+            end
+            if storage
+              f["storage"] = storage.to_s
             end
             
             res["functions"].push f
-          else
-            res["declarations"].push d.to_h(self)
+          elsif declarations
+            r = d.to_h_split(self)
+            r["storage"] = storage.to_s if storage
+            r["inline"] = true if inline?
+            res["declarations"].push r
           end
         }
       end
@@ -57,6 +99,7 @@ module C
         s["name"] = type.name
         m = []
         type.members.each { |mem|
+          mem.extract(res, declarations: false)
           m += mem.to_a
         }
         s["members"] = m
@@ -66,7 +109,7 @@ module C
         s["name"] = type.name
         m = []
         type.members.each { |mem|
-          m.push mem.to_h
+          m.push mem.to_h_split
         }
         s["members"] = m
         res["enums"].push s
@@ -75,6 +118,7 @@ module C
         s["name"] = type.name
         m = []
         type.members.each { |mem|
+          mem.extract(res, declarations: false)
           m += mem.to_a
         }
         s["members"] = m
@@ -89,7 +133,7 @@ module C
       entities.select { |e|
         e.kind_of? Declaration
       }.each { |e|
-        e.extract(res)
+        e.extract(res, declarations: true)
       }
       res
     end
@@ -99,7 +143,7 @@ module C
   float_longnesses = ['float', 'double', 'long double']
   ## DirectTypes
   class Struct
-    def to_h
+    def to_h_split(_ = nil)
       res = {}
       res["kind"] = "struct"
       if name
@@ -119,7 +163,7 @@ module C
   end
 
   class Union
-    def to_h
+    def to_h_split(_ = nil)
       res = {}
       res["kind"] = "union"
       if name
@@ -139,7 +183,7 @@ module C
   end
 
   class Enum
-    def to_h
+    def to_h_split
       res = {}
       res["kind"] = "enum"
       if name
@@ -147,7 +191,7 @@ module C
       else
         m = []
         members.each { |mem|
-          m.push mem.to_h
+          m.push mem.to_h_split
         }
         res["members"] = m
       end
@@ -159,7 +203,7 @@ module C
   end
 
   class Enumerator
-    def to_h
+    def to_h_split
       res = {}
       res["name"] = name
       if val
@@ -182,7 +226,7 @@ module C
     [Complex   , proc{"_Complex #{float_longnesses[longness]}"}],
     [Imaginary , proc{"_Imaginary #{float_longnesses[longness]}"}]
   ].each do |c, x|
-    c.send(:define_method, :to_h) do |_ = nil|
+    c.send(:define_method, :to_h_split) do |_ = nil|
       res = {}
       if self.kind_of? CustomType
         res["kind"] = "custom_type"
@@ -199,7 +243,7 @@ module C
 
   ## IndirectTypes
   class Pointer
-    def to_h(declaration = nil)
+    def to_h_split(declaration = nil)
       res = {}
       res["kind"] = "pointer"
       res["const"] = true if const?
@@ -207,28 +251,29 @@ module C
       res["volatile"] = true if volatile?
       if type
         if declaration
-          res["type"] = type.to_h(declaration)
+          res["type"] = type.to_h_split(declaration)
         else
-          res["type"] = type.to_h
+          res["type"] = type.to_h_split
         end
       else
-        res["type"] = declaration.type.to_h
+        res["type"] = declaration.type.to_h_split
       end
       res
     end
   end
+
   class Array
-    def to_h(declaration = nil)
+    def to_h_split(declaration = nil)
       res = {}
       res["kind"] = "array"
       if type
         if declaration
-          res["type"] = type.to_h(declaration)
+          res["type"] = type.to_h_split(declaration)
         else
-          res["type"] = type.to_h
+          res["type"] = type.to_h_split
         end
       else
-        res["type"] = declaration.type.to_h
+        res["type"] = declaration.type.to_h_split
       end
       if length
         res["length"] = length.to_s
@@ -236,30 +281,35 @@ module C
       res
     end
   end
+
   class Function
-    def to_h(declaration, no_types=false)
+    def to_h_split(declaration, no_types=false)
       res = {}
       res["kind"] = "function"
       if type
-        res["type"] = type.to_h(declaration)
+        res["type"] = type.to_h_split(declaration)
       else
-        res["type"] = declaration.type.to_h
+        res["type"] = declaration.type.to_h_split
       end
       if !params.nil?
         res["params"] = if no_types
             params.collect{|p| p.name }
           else
-            params.collect{|p| p.to_h }
+            params.collect{|p| p.to_h_split }
           end
       end
+      if var_args?
+        res["var_args"] = true
+      end
       res
     end
   end
+
   class Parameter
-    def to_h
+    def to_h_split
       res = {}
       res["name"] = name.to_s if name.to_s != ''
-      res["type"] = type.to_h
+      res["type"] = type.to_h_split
       res["register"] = true if register?
       res
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cast-to-yaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cast
@@ -39,6 +39,7 @@ files:
 - LICENSE
 - cast-to-yaml.gemspec
 - lib/cast-to-yaml.rb
+- lib/cast-to-yaml/to_h.rb
 - lib/cast-to-yaml/to_yaml.rb
 homepage: https://github.com/alcf-perfengr/cast-to-yaml
 licenses:
@@ -59,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extract information fom a c ast