- MLW ergänzt

39ea46fb · di68kap · fc3aa0d1 · 39ea46fb · 39ea46fb · 39ea46fb
Commit 39ea46fb authored Nov 16, 2017 by di68kap
5 changed files
--- a/examples/MLW/MLW.ebnf
+++ b/examples/MLW/MLW.ebnf
@@ -86,8 +86,8 @@ ArtikelKopf     = <   SchreibweisenPosition | StrukturPosition | GebrauchPositio

 SchreibweisenPosition =  "SCHREIBWEISE" [LZ] { SWKategorie }+

-SWKategorie      = SWTyp DPP [LZ] §(Varianten | { SWKategorie }+) [LZ]
-SWTyp            = scriptfat | scriptform | script | form | gen | abl | OFFEN
+SWKategorie      = SWTyp §DPP [LZ] ( Varianten | { SWKategorie }+ ) [LZ]
+SWTyp            = scriptfat | scriptform | script | form | gen | abl | FREITEXT

 scriptfat  = "script." "fat-"
 scriptform = "script. " "form"
@@ -97,34 +97,33 @@ form       = "form"
 gen        = "gen."
 abl        = "abl."

-OFFEN      = FREITEXT
-

 #### STRUKTUR-POSITION #######################################################

-StrukturPosition = "STRUKTUR" [LZ] { STKategorie }+
-STKategorie      = STTyp DPP [LZ] §(Varianten | { STKategorie }+) [LZ]
-STTyp            = "form." ZEICHENFOLGE
+StrukturPosition = "STRUKTUR" [LZ] §{ STKategorie }+
+STKategorie      = STTyp §DPP [LZ] ( Varianten | { STKategorie }+ ) [LZ]
+STTyp            = ZEICHENFOLGE


 #### GEBRAUCH-POSITION #######################################################

-GebrauchPosition = "GEBRAUCH"
+GebrauchPosition = "GEBRAUCH" [LZ] §{ GBKategorie }+
+GBKategorie      = GBTyp §DPP [LZ] ( Varianten | { GBKategorie }+ ) [LZ]
+GBTyp            = ZEICHENFOLGE


 #### METRIK-POSITION #########################################################

-MetrikPosition = "METRIK"
+MetrikPosition = "METRIK" [LZ] §{ MTKategorie }+
+MTKategorie      = MTTyp §DPP [LZ] ( Varianten | { MTKategorie }+ ) [LZ]
+MTTyp            = ZEICHENFOLGE


 #### VERWECHSLUNGS-POSITION ##################################################

-VerwechslungsPosition  = "VERWECHSELBAR" [LZ] [Confunditur]
-                         VerwechselungsVariante { ABS VerwechselungsVariante }+ [LZ]
-Confunditur            = "confunditur c." DPP [LZ]
-VerwechselungsVariante = !KATEGORIENZEILE Verwechselung DPP Beleg
-Verwechselung          = ZEICHENFOLGE
-
+VerwechselungsPosition = "VERWECHSELBAR" [LZ] §{ VWKategorie }+
+VWKategorie      = VWTyp §DPP [LZ] ( Varianten | { VWKategorie }+ ) [LZ]
+VWTyp            = ZEICHENFOLGE

 #### ARTIKELKOPF POSITIONEN VARIANTEN ########################################


--- a/examples/MLW/MLWCompiler.py
+++ b/examples/MLW/MLWCompiler.py
--- a/examples/MLW/MLW_ebnf_ERRORS.txt
+++ b/examples/MLW/MLW_ebnf_ERRORS.txt
-line:  81, column: 40, Error: Missing definition for symbol 'VerwechselungsPosition'
-line: 126, column:  1, Warning: Rule "VerwechslungsPosition" is not connected to parser root "Artikel" !
-line: 128, column:  1, Warning: Rule "Confunditur" is not connected to parser root "Artikel" !
-line: 129, column:  1, Warning: Rule "VerwechselungsVariante" is not connected to parser root "Artikel" !
-line: 130, column:  1, Warning: Rule "Verwechselung" is not connected to parser root "Artikel" !
-line: 188, column:  1, Warning: Rule "VerweisZiel" is not connected to parser root "Artikel" !
-line: 204, column:  1, Warning: Rule "DEU_GROSS" is not connected to parser root "Artikel" !
-line: 205, column:  1, Warning: Rule "DEU_KLEIN" is not connected to parser root "Artikel" !
-line: 208, column:  1, Warning: Rule "GROSSSCHRIFT" is not connected to parser root "Artikel" !
-line: 212, column:  1, Warning: Rule "SATZZEICHEN" is not connected to parser root "Artikel" !
-line: 216, column:  1, Warning: Rule "ERW_FREITEXT" is not connected to parser root "Artikel" !
-line: 233, column:  1, Warning: Rule "RZS" is not connected to parser root "Artikel" !
-line: 240, column:  1, Warning: Rule "NIEMALS" is not connected to parser root "Artikel" !
-line: 242, column:  1, Warning: Rule "DUMMY" is not connected to parser root "Artikel" !
+line: 191, column:  1, Warning: Rule "VerweisZiel" is not connected to parser root "Artikel" !
+line: 207, column:  1, Warning: Rule "DEU_GROSS" is not connected to parser root "Artikel" !
+line: 208, column:  1, Warning: Rule "DEU_KLEIN" is not connected to parser root "Artikel" !
+line: 211, column:  1, Warning: Rule "GROSSSCHRIFT" is not connected to parser root "Artikel" !
+line: 215, column:  1, Warning: Rule "SATZZEICHEN" is not connected to parser root "Artikel" !
+line: 219, column:  1, Warning: Rule "ERW_FREITEXT" is not connected to parser root "Artikel" !
+line: 236, column:  1, Warning: Rule "RZS" is not connected to parser root "Artikel" !
+line: 243, column:  1, Warning: Rule "NIEMALS" is not connected to parser root "Artikel" !
+line: 245, column:  1, Warning: Rule "DUMMY" is not connected to parser root "Artikel" !
--- a/examples/MLW/grammar_tests/REPORT/01_test_regexes.md
+++ b/examples/MLW/grammar_tests/REPORT/01_test_regexes.md


+Test of parser: "SCHLUESSELWORT"
+================================
+
+
+Match-test "m1"
+---------------
+
+### Test-code:
+    
+    AUTORIN 
+
+### AST
+    (SCHLUESSELWORT
+        (:RegExp
+            ""
+            ""
+        )
+        (:RegExp
+            "AUTORIN "
+        )
+    )
+
+
 Test of parser: "RZS"
 =====================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
    
@@ -22,8 +45,8 @@ Test of parser: "LEERZEILE"
 ===========================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
    
@@ -39,8 +62,8 @@ Match-test "1"
        )
    )

-Match-test "2"
--------------
+Match-test "m2"
+---------------

 ### Test-code:
    
@@ -59,8 +82,8 @@ Match-test "2"
        )
    )

-Match-test "3"
--------------
+Match-test "m3"
+---------------

 ### Test-code:
    
@@ -78,13 +101,31 @@ Match-test "3"
        )
    )

+Fail-test "f1"
+--------------
+
+### Test-code:
+    
+    
+
+Fail-test "f2"
+--------------
+
+### Test-code:
+    
+    
+    # Kommentar
+    
+    # Kommentar
+    
+

 Test of parser: "LÜCKE"
 =======================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
    
@@ -102,8 +143,8 @@ Match-test "1"
        )
    )

-Match-test "2"
--------------
+Match-test "m2"
+---------------

 ### Test-code:
    
@@ -131,8 +172,8 @@ Match-test "2"
        )
    )

-Match-test "3"
--------------
+Match-test "m3"
+---------------

 ### Test-code:
    
@@ -152,8 +193,8 @@ Match-test "3"
        )
    )

-Match-test "4"
--------------
+Match-test "m4"
+---------------

 ### Test-code:
    
@@ -196,8 +237,8 @@ Match-test "4"
        )
    )

-Match-test "5"
--------------
+Match-test "m5"
+---------------

 ### Test-code:
     #Kommentar
@@ -238,13 +279,41 @@ Match-test "5"
        )
    )

+Fail-test "f1"
+--------------
+
+### Test-code:
+     
+
+Fail-test "f2"
+--------------
+
+### Test-code:
+    
+    
+
+Fail-test "f3"
+--------------
+
+### Test-code:
+    
+    # Kommentar
+
+Fail-test "f4"
+--------------
+
+### Test-code:
+     #Kommentar
+    # Kommentar
+    # Kommentar
+

 Test of parser: "LEERRAUM"
 ==========================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
     
@@ -256,8 +325,8 @@ Match-test "1"
        )
    )

-Match-test "2"
--------------
+Match-test "m2"
+---------------

 ### Test-code:
     # Kommentar
@@ -272,8 +341,8 @@ Match-test "2"
        )
    )

-Match-test "3"
--------------
+Match-test "m3"
+---------------

 ### Test-code:
      
@@ -285,8 +354,8 @@ Match-test "3"
        )
    )

-Match-test "4"
--------------
+Match-test "m4"
+---------------

 ### Test-code:
    # Kommentar
@@ -298,8 +367,8 @@ Match-test "4"
        )
    )

-Match-test "5"
--------------
+Match-test "m5"
+---------------

 ### Test-code:
    # Kommentar
@@ -316,8 +385,8 @@ Match-test "5"
        )
    )

-Match-test "6"
--------------
+Match-test "m6"
+---------------

 ### Test-code:
    
@@ -351,8 +420,8 @@ Match-test "6"
        )
    )

-Match-test "7"
--------------
+Match-test "m7"
+---------------

 ### Test-code:
    
@@ -370,13 +439,19 @@ Match-test "7"
        )
    )

+Fail-test "f1"
+--------------
+
+### Test-code:
+    X
+

 Test of parser: "ZWW"
 =====================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
    
@@ -392,8 +467,8 @@ Match-test "1"
        )
    )

-Match-test "2"
--------------
+Match-test "m2"
+---------------

 ### Test-code:
    
@@ -412,8 +487,8 @@ Match-test "2"
        )
    )

-Match-test "3"
--------------
+Match-test "m3"
+---------------

 ### Test-code:
    
@@ -439,8 +514,8 @@ Match-test "3"
        )
    )

-Match-test "4"
--------------
+Match-test "m4"
+---------------

 ### Test-code:
    
@@ -465,13 +540,19 @@ Match-test "4"
        )
    )

+Fail-test "f1"
+--------------
+
+### Test-code:
+     
+

 Test of parser: "ZW"
 ====================


-Match-test "1"
--------------
+Match-test "m1"
+---------------

 ### Test-code:
    
@@ -487,8 +568,8 @@ Match-test "1"
        )
    )

-Match-test "2"
--------------
+Match-test "m2"
+---------------

 ### Test-code:
    
@@ -505,4 +586,12 @@ Match-test "2"
                "# Kommentar"
            )
        )
-    )
\ No newline at end of file
+    )
+
+Fail-test "f1"
+--------------
+
+### Test-code:
+    
+    
+    
\ No newline at end of file
--- a/examples/MLW/grammar_tests/REPORT/02_test_lemmaposition.md
+++ b/examples/MLW/grammar_tests/REPORT/02_test_lemmaposition.md