ucd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdaec7d175f5ab56710dc4b64d3e79ab6ad9a076
-  data.tar.gz: dada32605eab973771134ddf2bc3c62549cdd4d6
+  metadata.gz: bded63756cb059b1bf533324437fce70480ef263
+  data.tar.gz: 3d501486676a8d08b794ee646990935dc7b323fd
 SHA512:
-  metadata.gz: 1128275fe76fb04862fd555650f37c78452e8bc5449101bfbd97810568bddcd923aa19f2515612e893b8dbc4d7045327c0a79209c8212d8304c144d0da699b9c
-  data.tar.gz: d3a1c0a61fe3fece3f69fd0a8090a50ed1c499673ab7f2315b6a5a166f78383697fe52bd866017a4379f2658e271d697127f80b7ed35f5a4a1a2c5e425723f39
+  metadata.gz: 2ff41f9774f80876e95ffc19b66d2cda5f3048da368c678ba0f8aa6a19404a4b2c12f5938220369faee913a6672a1cdcf38fef1c369c03a700d104463d325c3c
+  data.tar.gz: 2f04d70df43b8f5be60acb6098f44b2b78576d0a8e20a6daac7974fd6daa41afb430d5cadac3e3ee4ec5989749ceaa3ba5eb61c92656b82a59736eb9217ca63f

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/ucd/parser.rb

@@ -34,7 +34,10 @@ module UCD
     rule(:whitespace)  { (match("\s") | match("\n") | str(";")).repeat(1) }
     rule(:whitespace?) { whitespace.maybe }
 
-    rule(:name) { match["[:alnum:]_-"].repeat(1) } # TODO: Any other needed?
+    rule(:name) { match['a-zA-Z0-9_-'].repeat(1) }
+
+    rule(:class_name_chars) { match('(?:[a-zA-Z0-9_-]|\:|\.)').repeat(1) }
+    rule(:class_name) { class_name_chars >> (str("(") >> class_name_chars >> str(")")).maybe }
 
     # -- Field/Method
 
@@ -44,7 +47,7 @@ module UCD
     rule(:member_access) { (kw_access_modifier.as(:access) >> spaces).maybe }
 
     rule(:method_abstract) { (kw_abstract.as(:abstract) >> spaces).maybe }
-    rule(:member_type)     { (spaces >> str(":") >> spaces >> name.as(:type)).maybe }
+    rule(:member_type)     { (spaces >> str(":") >> spaces >> class_name.as(:type)).maybe }
 
     rule(:field_keyword)     { kw_field >> spaces }
     rule(:field_name)        { name.as(:name) }
@@ -65,7 +68,7 @@ module UCD
     rule(:kw_class_relationship_type) { kw_generalizes | kw_realizes }
 
     rule(:class_relationship_type)       { kw_class_relationship_type.as(:type) >> spaces }
-    rule(:class_relationship_definition) { (class_relationship_type >> name.as(:name)).as(:class_relationship) }
+    rule(:class_relationship_definition) { (class_relationship_type >> class_name.as(:name)).as(:class_relationship) }
 
     # -- Relationship
 
@@ -76,7 +79,7 @@ module UCD
     rule(:relationship_type)           { kw_relationship_type.as(:type) >> spaces }
     rule(:relationship_from)           { (spaces >> (name.as(:name) | str("*").repeat(1)).as(:from)).maybe }
     rule(:relationship_to)             { (spaces >> (name.as(:name) | str("*").repeat(1)).as(:to)).maybe }
-    rule(:relationship_definition)     { (relationship_directionality >> relationship_type >> name.as(:name) >> relationship_from >> relationship_to).as(:relationship) }
+    rule(:relationship_definition)     { (relationship_directionality >> relationship_type >> class_name.as(:name) >> relationship_from >> relationship_to).as(:relationship) }
 
     # -- Class
 
@@ -89,7 +92,7 @@ module UCD
     rule(:class_body)              { spaces? >> str("{") >> whitespace? >> class_inner_definition.repeat.as(:members) >> str("}") }
     rule(:class_body?)             { class_body.maybe }
 
-    rule(:class_definition) { class_modifier >> class_keyword >> name.as(:name) >> class_body? }
+    rule(:class_definition) { class_modifier >> class_keyword >> class_name.as(:name) >> class_body? }
 
     # -- Document
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Scott Lewis