[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc/navidoc parser.py mp/uml.py
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc/navidoc parser.py mp/uml.py |
Date: |
Wed, 28 May 2003 05:42:58 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/05/28 05:42:57
Modified files:
navidoc : parser.py
navidoc/mp : uml.py
Log message:
something for metpost variable problem
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.13 navidoc/navidoc/mp/uml.py:1.14
--- navidoc/navidoc/mp/uml.py:1.13 Mon May 26 05:04:46 2003
+++ navidoc/navidoc/mp/uml.py Wed May 28 05:42:57 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: uml.py,v 1.13 2003/05/26 09:04:46 humppake Exp $
+# $Id: uml.py,v 1.14 2003/05/28 09:42:57 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -181,16 +181,22 @@
dbg("mpclass: %s %s" % (s, list))
toks = s.split(" ");
s = toks[0]
+ (can_s, None) = re.subn('[0-9]', '', s)
+ if s != can_s:
+ raise UMLException('Class name %s contains numbers. Please, use
syntax "class foo foo123".' % (s))
+ self.var = var or s
+ self.name = s
+
self.stereo = None
for tok in toks[1:]:
mat = re.match('"(.*)"', tok)
if mat:
self.stereo = mat.group(1)
- self.var = var or s
- self.name = s
+ else: self.name = tok
+
self.methods = self.fields = []
self.do_contents(list)
- if self.link != None:
+ if self.link:
self.link.bbox = ('bboxmeasuredpic(%s)' %(self.var))
def handle_contained(self, el):
if el[0] == "methods":
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.15 navidoc/navidoc/parser.py:1.16
--- navidoc/navidoc/parser.py:1.15 Tue May 20 06:58:13 2003
+++ navidoc/navidoc/parser.py Wed May 28 05:42:57 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.15 2003/05/20 10:58:13 humppake Exp $
+# $Id: parser.py,v 1.16 2003/05/28 09:42:57 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -95,16 +95,24 @@
self.list.append(element)
self.list.extend(self.extras)
- def add_contained_element(self, super, element):
+ def add_contained_element(self, super, elements):
"""
Add a subelement.
"""
- s = element[0]
+ s = elements[0]
(w,s) = match_remove("^\s*(\w+)\s*", s)
key = w.group(1)
- element = self.factor.create_new(key, None, super.name + " " + s,
element[1:])
+
+ # XXX this need clariying sometime, why every element don't have 'var'?
+ if super.var != None:
+ element = self.factor.create_new(key, None, super.var + " " + s,
elements[1:])
+ else:
+ element = self.factor.create_new(key, None, super.name + " " + s,
elements[1:])
if isinstance(element, navidoc.link.Link):
+ # mpclass may have different var and name, links should be base on
name :/
+ if super.var != super.name:
+ element = self.factor.create_new(key, None, super.name + " " +
s, elements[1:])
super.link = element
self.extras.insert(0, element)
else: self.extras.append(element)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc/navidoc parser.py mp/uml.py,
Asko Soukka <=