[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source

László Németh nemeth at numbertext.org
Tue Oct 29 12:41:08 CET 2013


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

New commits:
commit eae6ac5550d28379a55231111af022da7f1f936d
Author: László Németh <nemeth at numbertext.org>
Date:   Mon Oct 28 14:03:46 2013 +0100

    fdo#70951 librelogo: fix parsing problem of functions
    
    (almost cherry picked from commit 850871e04e247262242836180d8a5cf59b2f95ef)
    
    Change-Id: I6cbe99d405cf45c0d7b04f0ad76a555096024f65
    Reviewed-on: https://gerrit.libreoffice.org/6462
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index bfe5686..1367f3b 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1509,7 +1509,7 @@ def __compil__(s):
             (?:[^\n]*(?<!\b(%(END)s))\n)* # 0 or more lines (not END)
             [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT)
             (?:[^\n]*(?<!\b(?:%(END)s))\n)* # 0 or more lines (not END)
-            (?:%(END)s)\b""" % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of "END" doesn't supported)
+            [ \t]*\b(?:%(END)s)\b""" % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of "END" doesn't supported)
         # add line breaks before procedure calls
         procedures = set(subnames) - set(functions)
         if len(procedures) > 0:


More information about the Libreoffice-commits mailing list