decode 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f1e26c4b0aad982ae69ec4240f058d101c92f15b125f12e17b0a59e7f1a8f2
-  data.tar.gz: 552744c2f9ab8477a01eafd7042f5332325a779d94a29d8a4ec03df387a9174b
+  metadata.gz: 59ccb94aeeb9afb9e56f473a90991bfb2955ce6bdc2a681b1c8ecf7ee72974f9
+  data.tar.gz: d092f82acb7134df72dfbf2042617f656b94749c8f5b89ec7830e002ff781e8e
 SHA512:
-  metadata.gz: fe2a85001a162ca96082bd05788d7b57bae41af6aed065c72db26ef2c1d10d0b7c7e76836cf236a640bb7fdba84c66977e387e0fab449536c6915e3ec2413262
-  data.tar.gz: a55480e4354fd41c4bb6e5197180289ab1b29671f65988b67935f001016fd731d083adfbd9edcd079fb2a50894ed2a5ba0b728722c54f66f378609009e20033a
+  metadata.gz: 4df6fd92d34b379631cf7a0358e3d41c7470824daadd0ce9274def8b40cd5579ddb9d81eaed6cfdd8bf44a09b735525332a35b75fb0cb95068063d5e67431c52
+  data.tar.gz: fc5a74af220d01473013e7943d778017fd7f141086103fb350713e935893c2616495d1ce61a5b8421a940dfe44ca3b8eb3658dab0190ef3f4232fa2d9765892f

data/lib/decode/definition.rb

@@ -39,6 +39,13 @@ module Decode
 		# A long form of the definition, e.g. `def initialize(kind, name, comments, **options)`.
 		# @return [String | nil]
 		def long_form
+			self.short_form
+		end
+		
+		# A long form which uses the qualified name if possible. Defaults to the {long_form}.
+		# @return  [String | nil]
+		def qualified_form
+			self.long_form
 		end
 		
 		# The full text of the definition.

data/lib/decode/language/ruby/attribute.rb

@@ -0,0 +1,37 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'definition'
+
+module Decode
+	module Language
+		module Ruby
+			class Attribute < Definition
+				def keyword
+					@node.children[1]
+				end
+				
+				def short_form
+					"#{self.keyword} #{@name.inspect}"
+				end
+			end
+		end
+	end
+end

data/lib/decode/language/ruby/class.rb

@@ -35,12 +35,16 @@ module Decode
 				def long_form
 					if super_node = @node.children[1]
 						@node.location.keyword.join(
-							super_node.location.name
+							super_node.location.expression
 						).source
 					else
 						self.short_form
 					end
 				end
+				
+				def qualified_form
+					"class #{self.qualified_name}"
+				end
 			end
 			
 			class Singleton < Definition

data/lib/decode/language/ruby/parser.rb

@@ -20,6 +20,7 @@
 
 require 'parser/current'
 
+require_relative 'attribute'
 require_relative 'class'
 require_relative 'constant'
 require_relative 'function'
@@ -40,7 +41,9 @@ module Decode
 					
 					top, comments = @parser.parse_with_comments(buffer)
 					
-					walk(top, comments, &block)
+					if top
+						walk(top, comments, &block)
+					end
 				end
 				
 				def extract_comments_for(node, comments)
@@ -135,6 +138,25 @@ module Decode
 						)
 						
 						yield definition
+					when :send
+						name = node.children[1]
+						case name
+						when :attr, :attr_reader, :attr_writer, :attr_accessor
+							definition = Attribute.new(
+								:def, name_for(node.children[2]),
+								extract_comments_for(node, comments), node,
+								parent: parent, language: Ruby
+							)
+							
+							yield definition
+						end
+					end
+				end
+				
+				def name_for(node)
+					case node.type
+					when :sym
+						return node.children[0]
 					end
 				end
 			end

data/lib/decode/language/ruby.rb

@@ -52,6 +52,10 @@ module Decode
 				
 				return buffer
 			end
+			
+			def self.reference(value)
+				Reference.new(value)
+			end
 		end
 	end
 end

data/lib/decode/trie.rb

@@ -42,7 +42,9 @@ module Decode
 			end
 			
 			def traverse(path = [], &block)
-				if yield(path, self)
+				catch(:skip) do
+					yield(path, self)
+					
 					@children.each do |name, node|
 						node.traverse([*path, name], &block)
 					end

data/lib/decode/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Decode
-	VERSION = "0.5.0"
+	VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decode
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -127,6 +127,7 @@ files:
 - lib/decode/index.rb
 - lib/decode/language.rb
 - lib/decode/language/ruby.rb
+- lib/decode/language/ruby/attribute.rb
 - lib/decode/language/ruby/class.rb
 - lib/decode/language/ruby/constant.rb
 - lib/decode/language/ruby/definition.rb