[Libreoffice-commits] core.git: librelogo/source

László Németh nemeth at numbertext.org
Thu Feb 7 01:55:38 PST 2013


 librelogo/source/LibreLogo/LibreLogo.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af29c96b049fa313bdc80de618e9acb127882400
Author: László Németh <nemeth at numbertext.org>
Date:   Thu Feb 7 10:53:35 2013 +0100

    fdo#60406 librelogo: fix name conflict in procedure handling
    
    Change-Id: I05efe58e38b7c2183ecc733b6db45ec6fa04cab7

diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index 3dc6140..f797758 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1368,7 +1368,7 @@ def __compil__(s):
         # add line breaks before procedure calls
         procedures = set(subnames) - set(functions)
         if len(procedures) > 0:
-            s = re.sub(r"(?<!__def__)(?<![-+=*/])(?<!%s)(?:^|[ \t]+)(" % ")(?<!".join(functions) + "|".join(procedures) + ")", r"\n\1", s)
+            s = re.sub(r"(?<!__def__)(?<![-+=*/])(?<!%s)(?:^|[ \t]+)(" % ")(?<!".join(functions) + "|".join(procedures) + ")(?!\w)", r"\n\1", s)
 
     # compile native Logo
     for i in __comp__[_.lng]:


More information about the Libreoffice-commits mailing list