Merge lp:~danilovesky/workcraft/trunk-bug-1326800 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj'
--- WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj	2010-10-06 15:51:01 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj	2014-06-05 15:01:31 +0000
@@ -46,6 +46,7 @@
   	| <NAME: (["_","A"-"Z","a"-"z","0"-"9"])+>
   	| <INTEGER: (["0"-"9"])+>
   	| <QUOTED: "\""(~["\""] | "\\\"")*"\"" >
+  	| <NUMERAL: (["-"])?("."(["0"-"9"])+ | (["0"-"9"])+ ("."(["0"-"9"])*)?)>
 }
 
 String id() :
{
  Token t;
}
{
@@ -56,7 +57,9 @@
   | t = "digraph"
   | t = "node"
   | t = "edge"
-  | t = < NAME >
  )
  {
    return t.image;
  }
}
+  | t = < NAME >
+  | t = < NUMERAL >
  )
  {
    return t.image;
  }
+}
 
 void graph(DotListener listener) :
 {
}
@@ -102,4 +105,4 @@
 {
	("graph"|"node"|"edge") attr_list()
 }
 
-void statement(DotListener listener) :
{
  Token name;
  Map < String, String > prop;
  String i, j;
}
{
  (
    attr_statement()
  | i = id()
    (
      prop = attr_list()
      {
        listener.node(i, prop);
      }
    | "->" j = id() prop = attr_list()
      {
        listener.arc(i, j, prop);
      }
    )
  )
  ";"
}
\ No newline at end of file
+void statement(DotListener listener) :
{
  Token name;
  Map < String, String > prop;
  String i, j;
}
{
  (
    attr_statement()
  	| i = id()
    (
      prop = attr_list()
      {
        listener.node(i, prop);
      }
    | "->" j = id() prop = attr_list()
      {
        listener.arc(i, j, prop);
      }
    )
  )
  ";"
}
\ No newline at end of file