Richer class names and introduction of "classtypes"

plantcode

@@ -179,6 +179,7 @@ function processTemplateFile(config, templateData, dictionary) {
          "getKeyword": true,
          "getMethods": true,
          "getName": true,
+         "getType": true,
          "getParameters": true,
          "getReturnType": true,
          "hasFields": true,

src/Class.js

@@ -4,10 +4,11 @@ module.exports = (function () {
   var Field = require("./Field");
   var Method = require("./Method");
 
-  var Class = function (className, fileLines) {
+  var Class = function (className, fileLines, classType) {
     this.cExtends = null;
     this.fileLines = fileLines || [];
     this.className = className;
+    this.classType = classType || "";
     this.nNamespace = null;
   }
 
@@ -39,6 +40,10 @@ module.exports = (function () {
     return this.className;
   }
 
+  Class.prototype.getType = function () {
+    return this.classType;
+  }
+
   Class.prototype.hasMethods = function () {
     for (var i = 0, length = this.fileLines.length; i < length; i++) {
       if (this.fileLines[i] instanceof Method) {

src/plantcode.js

@@ -73,6 +73,7 @@ function processTemplateFile(config, templateData, dictionary) {
          "getKeyword": true,
          "getMethods": true,
          "getName": true,
+         "getType": true,
          "getParameters": true,
          "getReturnType": true,
          "hasFields": true,

src/plantuml.pegjs

@@ -79,10 +79,9 @@ newline
   = [\r\n]
   / [\n]
 classdeclaration
-  = noise "class " noise classname:objectname noise startblock lines:umllines endblock { var Class = require("./Class"); return new Class(classname, lines) }
-  / noise "class " noise classname:objectname noise "<<" noise [^>]+ noise ">>" noise { var Class = require("./Class"); return new Class(classname) }
-  / noise "class " noise classname:objectname noise { var Class = require("./Class"); return new Class(classname) }
-  / noise "class " noise classname:objectname noise newline noise lines:umllines "end class" { var Class = require("./Class"); return new Class(classname, lines) }
+  = noise "class " noise classname:objectname noise classtype:objecttype? noise startblock lines:umllines endblock       { var Class = require("./Class"); return new Class(classname, lines, classtype) }
+  / noise "class " noise classname:objectname noise classtype:objecttype? noise                                          { var Class = require("./Class"); return new Class(classname, null, classtype) }
+  / noise "class " noise classname:objectname noise classtype:objecttype? noise newline noise lines:umllines "end class" { var Class = require("./Class"); return new Class(classname, lines, classtype) }
 interfacedeclaration
   = noise "interface " noise interfacename:objectname noise startblock lines:umllines endblock { var Interface = require("./Interface"); return new Interface(interfacename, lines) }
   / noise "interface " noise interfacename:objectname noise "<<" noise [^>]+ noise ">>" noise { var Interface = require("./Interface"); return new Interface(interfacename) }
@@ -111,7 +110,10 @@ methodparameter
 returntype
   = items:[^ ,\n\r\t(){}]+ { return items.join("") }
 objectname
-  = objectname:([A-Za-z_][A-Za-z0-9.]*) { return [objectname[0], objectname[1].join("")].join("") }
+  = item:(richchars) { return item.join("") }
+  / "\"" item:(richerchars) "\"" { return item.join("") }
+objecttype
+  = "<<" noise item:(richerchars) noise ">>" { return item.join("") }
 membername
   = items:([A-Za-z_][A-Za-z0-9_]*) { return [items[0], items[1].join("")].join("") }
 accessortype
@@ -124,3 +126,7 @@ privateaccessor
   = [-]
 protectedaccessor
   = [#]
+richchars
+  = [A-Za-z0-9_:;~#!§$()\[\]\+\-\*\\/|,]+
+richerchars
+  = [A-Za-z0-9_:;~#!§$()\[\]\+\-\*\\/|,{} ]+

templates/coffeescript.hbs

@@ -1,4 +1,5 @@
 {{#if_ne getKeyword "interface"}}class {{getFullName}}{{#if getExtends}} extends {{#with getExtends}}{{getFullName}}{{/with}}{{/if}}
+{{#if getType}}# was typed as <<{{getType}}>>{{/if}}
 {{#each getFields}}
   {{this.getName}}: undefined
 {{/each}}

tests/complex/classnames.coffee

@@ -0,0 +1,31 @@
+class someclass
+
+
+
+
+class §$noQuotes|_:;~#!§$()[]+-*\/,|
+
+
+
+
+class inQuotes
+
+
+
+
+class AZaz09 |_:;~#!§$()[]+-*\/,{}|
+
+
+
+
+class withDescr1
+# was typed as <<something>>
+
+
+
+class withDescr2
+# was typed as <<some { } thing>>
+
+
+
+

tests/complex/classnames.plantuml

@@ -0,0 +1,21 @@
+@startuml
+' node node_modules/pegjs/bin/pegjs src/plantuml.pegjs src/plantuml.js
+' node plantcode -l coffeescript tests/complex/classnames.plantuml > tests/complex/classnames.coffee
+
+class someclass
+
+class §$noQuotes|_:;~#!§$()[]+-*\/,| {
+}
+
+class "inQuotes" {
+}
+
+class "AZaz09 |_:;~#!§$()[]+-*\/,{}|" {
+}
+
+class "withDescr1" <<something>>
+
+class "withDescr2" <<some { } thing>> {
+}
+
+@enduml