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

[László Németh]

 librelogo/source/LibreLogo/LibreLogo.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 236d87d529ed4c5c4b19320f222ac2cc8b0312ae
Author: László Németh <nemeth at numbertext.org>
Date:   Mon Mar 31 11:12:57 2014 +0200

    fdo#75109 librelogo: fix localized procedures
    
    Change-Id: Ia6edb02b871a41828758ba5fd5376c811c4084cc

diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index 7b5930b..d44ffa1 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1607,11 +1607,16 @@ def __compil__(s):
     if len(subnames) > 0:
         globs = "global %s" % ", ".join(subnames)
         # search user functions (function calls with two or more arguments need explicite Python parentheses)
+        ends = __l12n__(_.lng)["END"] # support multiple names of "END"
+        firstend = ends.split("|")[0]
+        s = re.sub(r"(?<!:)\b(?:%s)\b" % ends, firstend, s)
+        __l12n__(_.lng)["END"] = firstend
         functions += [ re.findall("(?u)\w+",i[0])[0]  for i in re.findall(r"""(?iu)(?<=__def__ )([^\n]*)\n # beginning of a procedure
             (?:[^\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)
-            [ \t]*\b(?:%(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) ]
+        __l12n__(_.lng)["END"] = ends
         # add line breaks before procedure calls
         procedures = set(subnames) - set(functions)
         if len(procedures) > 0: