Changeset 1841

Timestamp:

08/06/07 06:21:26 (1 year ago)

Author:

wrobe..@pld-linux.org

Message:

- name should not start with number (still inapropriate name will be set

from garbage re group)

- allow to enter multiplicity as '[1]' not only '1'

Files:

• gaphor/trunk/gaphor/UML/umllex.py (modified) (4 diffs)

gaphor/trunk/gaphor/UML/umllex.py

@@ -22 +22 @@
-
-# name (required) ::= name
-\w+
+[a-zA-Z_]\w*
-
-# Multiplicity (added to type_subpat) ::= '[' [mult_l ..] mult_u ']'
-mult_subpat = r'\s*(\[\s*((?P<mult_l>[0-9]+)\s*\.\.)?\s*(?P<mult_u>([0-9]+|\*))\s*\])?'
-((?P<mult_l>[0-9]+)\s*\.\.)?\s*(?P<mult_u>([0-9]+|\*))
+\[?((?P<mult_l>[0-9]+)\s*\.\.)?\s*(?P<mult_u>([0-9]+|\*))\]?
-
-# Type and multiplicity (optional) ::= ':' type [mult]
@@ -150 +150 @@
-    from uml2 import LiteralSpecification
-    create = self._factory.create
+
+    # if no name, then clear as there could be some garbage
+    # due to previous parsing (i.e. '[1'
+    m = association_end_name_pat.match(s)
+    if m and not m.group('name'):
+        self.name = ''
+
-    m = association_end_mult_pat.match(s)
-    if m and m.group('mult_u') or m.group('tags'):
@@ -183 +190 @@
-                    self.lowerValue = create(LiteralSpecification)
-                self.lowerValue.value = g('mult_l')
+            else:
+                self.lowerValue.value = ''
-            if g('mult_u'):
-                if not g('mult_l') and self.lowerValue:
@@ -189 +198 @@
-                    self.upperValue = create(LiteralSpecification)
-                self.upperValue.value = g('mult_u')
+            else:
+                self.upperValue.value = ''
-            tags = g('tags')
-            if tags: