Merge branch 'py10' of https://github.com/sdpython/pyensae into py10

.gitignore

@@ -51,6 +51,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+.eggs/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

_unittests/ut_languages/test_parse_code.py

@@ -7,38 +7,38 @@
 import os
 import unittest
 import warnings
-from pyquickhelper.loghelper import fLOG
+from pyquickhelper.pycode import ExtTestCase
 
 
-class TestParseCode(unittest.TestCase):
+class TestParseCode(ExtTestCase):
 
     def test_build_parser(self):
         from pyensae.languages.antlr_grammar_use import (
             get_parser_lexer, get_tree_string, parse_code)
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         langs = ["DOT", "CSharp4", "SQLite", "R"]  # , "Python3"]
 
-        try:
-            for lang in langs:
-                get_parser_lexer(lang)
-            return
-        except ImportError:
-            pass
+        for lang in langs:
+            with self.subTest(lang=lang):
+                try:
+                    get_parser_lexer(lang)
+                    return
+                except ImportError:
+                    pass
 
         folder = os.path.dirname(source_parser.__file__)
 
+        rows = []
+
+        def local_print(*s):
+            rows.append(' '.join(map(str, s)))
+
         for lang in langs:
-            fLOG("generate for LANG", lang)
             gr = os.path.join(folder, lang + ".g4")
             assert os.path.exists(gr)
-            final = build_grammar(lang, fLOG=fLOG)
+            final = build_grammar(lang, fLOG=local_print)
             fLOG(final)
 
     def test_r(self):
@@ -47,11 +47,6 @@ def test_r(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         code = """
         a = 4 ;
         b = 5 ;
@@ -64,7 +59,6 @@ def test_r(self):
         st = get_tree_string(tree, parser)
         assert len(st) > 0
         st = get_tree_string(tree, parser, None)
-        fLOG(st.replace("\\n", "\n"))
         assert len(st) > 0
 
     def test_sql(self):
@@ -73,11 +67,6 @@ def test_sql(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         code = """
         SELECT a,tbl.b,nb FROM tbl
         INNER JOIN (
@@ -90,7 +79,6 @@ def test_sql(self):
         parser = parse_code(code, clparser, cllexer)
         tree = parser.parse()
         st = get_tree_string(tree, parser, None)
-        fLOG(st.replace("\\n", "\n"))
         assert len(st) > 0
 
     def test_error(self):
@@ -99,11 +87,6 @@ def test_error(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         code = """
         SELECT
                 a,
@@ -126,11 +109,6 @@ def test_csharp(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         code = """
         namespace hello
         {
@@ -148,7 +126,6 @@ def test_csharp(self):
         parser = parse_code(code, clparser, cllexer)
         tree = parser.compilation_unit()
         st = get_tree_string(tree, parser)
-        fLOG(st.replace("\\n", "\n"))
         assert len(st) > 0
 
     def test_python3(self):
@@ -157,11 +134,6 @@ def test_python3(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         # the grammar does not fully compile
 
         code = """
@@ -181,7 +153,6 @@ def addition(x, y):
             warnings.warn("Grammar for Python3 not ready yet: {0}".format(e))
             return
         st = get_tree_string(tree, parser)
-        fLOG(st.replace("\\n", "\n"))
         assert len(st) > 0
 
     def test_DOT(self):
@@ -190,11 +161,6 @@ def test_DOT(self):
         from pyensae.languages.antlr_grammar_build import build_grammar
         import pyensae.languages.antlr_grammar_use as source_parser
 
-        fLOG(
-            __file__,
-            self._testMethodName,
-            OutputPrint=__name__ == "__main__")
-
         # the grammar does not fully compile
 
         code = """
@@ -208,9 +174,9 @@ def test_DOT(self):
         parser = parse_code(code, clparser, cllexer)
         tree = parser.graph()
         st = get_tree_string(tree, parser)
-        fLOG(st.replace("\\n", "\n"))
         assert len(st) > 0
 
 
 if __name__ == "__main__":
+    TestParseCode().test_csharp()
     unittest.main()

_unittests/ut_languages/test_parse_code_csharp.py

@@ -56,7 +56,7 @@ def test_csharp_parse(self):
         tree = parser.compilation_unit()
         st = get_tree_string(tree, parser)
         self.assertNotEmpty(st)
-        self.assertIn("/// <summary>", st)
+        self.assertIn("namespace", st)
 
 
 if __name__ == "__main__":

bin/update_grammars.bat

@@ -19,6 +19,8 @@ set current=%~dp0
 if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u %current%..\setup.py update_grammars --g CSharpLexer.g4
 if %errorlevel% neq 0 exit /b %errorlevel%
+%pythonexe% -u %current%..\setup.py update_grammars --g CSharpPreprocessorParser.g4
+if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u %current%..\setup.py update_grammars --g CSharpParser.g4
 if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u %current%..\setup.py update_grammars --g DOT.g4
@@ -29,5 +31,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 if %errorlevel% neq 0 exit /b %errorlevel%
 %pythonexe% -u %current%..\setup.py update_grammars --g SQLiteParser.g4
 if %errorlevel% neq 0 exit /b %errorlevel%
-%pythonexe% -u %current%..\setup.py update_grammars --g R.g4 RFilter.g4
+%pythonexe% -u %current%..\setup.py update_grammars --g R.g4
+if %errorlevel% neq 0 exit /b %errorlevel%
+%pythonexe% -u %current%..\setup.py update_grammars --g RFilter.g4
 if %errorlevel% neq 0 exit /b %errorlevel%

build_script.bat

@@ -5,7 +5,7 @@ set pythonexe="%1"
 goto custom_python:
 
 :default_value_python:
-set pythonexe="c:\Python391_x64\python.exe"
+set pythonexe="c:\Python3105_x64\python.exe"
 if not exist %pythonexe% set pythonexe="c:\Python372_x64\python.exe"
 :custom_python:
 @echo [python] %pythonexe%

src/pyensae/_pylint_common.py

@@ -31,6 +31,7 @@ def _private_test_style_src(fLOG, run_lint, verbose=False, pattern=".*[.]py$"):
                      "R0401: Cyclic import (src.pyensae.sql.sql_interface",
                      "R0401: Cyclic import (pyensae.sql.sql_interface",
                      "database_core2.py:230: R1714",
+                     "RFilter.py",
                      ])