Merge pull request #23 from bryan967132/develop

Version 1, Prefix
bryan967132 · Jun 6, 2023 · d5d541b · d5d541b
2 parents 2a08909 + 3072e33
commit d5d541b
Show file tree

Hide file tree

Showing 29 changed files with 391 additions and 351 deletions.
diff --git a/GramaticaLibreDeContexto.md b/GramaticaLibreDeContexto.md
@@ -30,12 +30,11 @@ SPECIFIC ->
     TK_char
 
 OPERATION ->
-    OPERATION '.' OPERATION |
-    OPERATION '|' OPERATION |
-    OPERATION '*'           |
-    OPERATION '+'           |
-    OPERATION '?'           |
-    '(' OPERATION ')'       |
+    '.' OPERATION OPERATION |
+    '|' OPERATION OPERATION |
+    '*' OPERATION           |
+    '+' OPERATION           |
+    '?' OPERATION           |
     OPERAND
 
 OPERAND ->

diff --git a/Images/ManualUsuario/Abierto.png b/Images/ManualUsuario/Abierto.png
diff --git a/Images/ManualUsuario/Abrir.png b/Images/ManualUsuario/Abrir.png
diff --git a/Images/ManualUsuario/Analizar.png b/Images/ManualUsuario/Analizar.png
diff --git a/Images/ManualUsuario/GuardadoComo.png b/Images/ManualUsuario/GuardadoComo.png
diff --git a/Images/ManualUsuario/Guardar.png b/Images/ManualUsuario/Guardar.png
diff --git a/Images/ManualUsuario/GuardarComo.png b/Images/ManualUsuario/GuardarComo.png
diff --git a/Images/ManualUsuario/GuardarComoNombrar.png b/Images/ManualUsuario/GuardarComoNombrar.png
diff --git a/Images/ManualUsuario/Nuevo.png b/Images/ManualUsuario/Nuevo.png
diff --git a/Images/ManualUsuario/NuevoCreado.png b/Images/ManualUsuario/NuevoCreado.png
diff --git a/Images/ManualUsuario/NuevoNombrar.png b/Images/ManualUsuario/NuevoNombrar.png
diff --git a/Images/ManualUsuario/Validar.png b/Images/ManualUsuario/Validar.png
diff --git a/ManualTecnico.md b/ManualTecnico.md
@@ -9,7 +9,7 @@
 4. [Cálculo De Siguientes](#4-cálculo-de-siguientes)
 5. [Cálculo De Transiciones](#5-cálculo-de-transiciones)
 6. [Método De Thompson](#6-método-de-thompson)
-7. [Diagrama De Clases](#7-diagrama-de-clases)
+7. [Método De Thompson](#7-diagrama-de-clases)
 
 ## 1. Análisis Léxico
 * ### Tabla de Tokens
@@ -44,13 +44,13 @@
 
 ## 2. Análisis Sintáctico
 * ### Expresion Regular en Notación Polaca
-    Los operadores se escriben entre los operandos para operadores binarios y al final para operadores unarios.
+    Los operadores se escriben antes que los operandos.
     <br>Ejemplo:<br>
-    * operando | operando
-    * operando . operando
-    * operando \+
-    * operando \*
-    * operando ?
+    * | operando operando
+    * . operando operando
+    * \+ operando
+    * \* operando
+    * ? operando
 
 * ### Gramática Libre del Contexto
 ```java
@@ -82,12 +82,11 @@ SPECIFIC ->
     TK_char
 
 OPERATION ->
-    OPERATION '.' OPERATION |
-    OPERATION '|' OPERATION |
-    OPERATION '*'           |
-    OPERATION '+'           |
-    OPERATION '?'           |
-    '(' OPERATION ')'       |
+    '.' OPERATION OPERATION |
+    '|' OPERATION OPERATION |
+    '*' OPERATION           |
+    '+' OPERATION           |
+    '?' OPERATION           |
     OPERAND
 
 OPERAND ->
@@ -163,12 +162,11 @@ EVALUATION -> TK_id ':' TK_str ';'
         IDS:regex TK_prompt OPERATION:op TK_semicolon                   {:addTree(regex,op);:} ;
 
     OPERATION ::=
-        OPERATION:op1 TK_or     OPERATION:op2   {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
-        OPERATION:op1 TK_concat OPERATION:op2   {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
-        OPERATION:op1 TK_kleene                 {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
-        OPERATION:op1 TK_positive               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
-        OPERATION:op1 TK_optional               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
-        TK_lpar OPERATION:op TK_rpar            {:RESULT = op;                                                             :} |
+        TK_or       OPERATION:op1 OPERATION:op2 {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
+        TK_concat   OPERATION:op1 OPERATION:op2 {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
+        TK_kleene   OPERATION:op1               {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
+        TK_positive OPERATION:op1               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
+        TK_optional OPERATION:op1               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
         OPERAND:op                              {:RESULT = op;                                                             :} ;
 
     OPERAND ::=

diff --git a/ManualUsuario.md b/ManualUsuario.md
@@ -100,19 +100,19 @@ El reporte se genera y abre automáticamente al momento del análisis si se dete
 [Subir](#exregan)
 
 ## 5. Expresión Regular
-* ### Expresion Regular en Notación Infija
+* ### Expresion Regular en Notación Polaca
     Los operadores se escriben antes que los operandos.
     <br>Ejemplo:<br>
-    * operando | operando
-    * operando . operando
-    * operando \+
-    * operando \*
-    * operando ?
-* ### Ejemplos de  Expresiones Regulares en Notación Infija
-    |Notación Infija|Notación Prefija|
+    * | operando operando
+    * . operando operando
+    * \+ operando
+    * \* operando
+    * ? operando
+* ### Ejemplos de  Expresiones Regulares en Notación Prefija o Polaca
+    |Notación Prefija|Notación Infija|
     |----------------|---------------|
-    |((operando)* \| operando)+|+ \| * operando operando|
-    |(operando)+(operando \| operando)|. + operando \| operando operando|
+    |+ \| * operando operando|((operando)* \| operando)+|
+    |. + operando \| operando operando|(operando)+(operando \| operando)|
 
 [Subir](#exregan)
 
@@ -128,9 +128,9 @@ CONJ: digit -> 0~9;
 --------------COMENTARIO MULTILÍNEA--------------
 !>
 //Expresiones Regulares
-REGEX1 -> ("1"?."2"*|"3"+."2"*)|("2"?."3"+."1"|"3"."1"*);
-REGEX2 -> ("a"."b"."c")+|"a"?."x"."y"."z"|("0"|"1")+;
-numero -> {digit}+.(".".{digit}+)?;
+REGEX1 -> ||.?"1"*"2".+"3"*"2"|..?"2"+"3""1"."3"*"1";
+REGEX2 -> ||+.."a""b""c"...?"a""x""y""z"+|"0""1";
+numero -> .+{digit}?."."+{digit};
 
 %%
 //Validación de Cadenas

diff --git a/Proyecto1.jar b/Proyecto1.jar
diff --git a/README.md b/README.md
@@ -12,9 +12,9 @@ CONJ: digit -> 0~9;
 --------------COMENTARIO MULTILÍNEA--------------
 !>
 //Expresiones Regulares
-REGEX1 -> ("1"?."2"*|"3"+."2"*)|("2"?."3"+."1"|"3"."1"*);
-REGEX2 -> ("a"."b"."c")+|"a"?."x"."y"."z"|("0"|"1")+;
-numero -> {digit}+.(".".{digit}+)?;
+REGEX1 -> ||.?"1"*"2".+"3"*"2"|..?"2"+"3""1"."3"*"1";
+REGEX2 -> ||+.."a""b""c"...?"a""x""y""z"+|"0""1";
+numero -> .+{digit}?."."+{digit};
 
 %%
 //Validación de Cadenas
@@ -58,12 +58,11 @@ SPECIFIC ->
     TK_char
 
 OPERATION ->
-    OPERATION '.' OPERATION |
-    OPERATION '|' OPERATION |
-    OPERATION '*'           |
-    OPERATION '+'           |
-    OPERATION '?'           |
-    '(' OPERATION ')'       |
+    '.' OPERATION OPERATION |
+    '|' OPERATION OPERATION |
+    '*' OPERATION           |
+    '+' OPERATION           |
+    '?' OPERATION           |
     OPERAND
 
 OPERAND ->

diff --git a/bin/Files b/bin/Files
diff --git a/bin/Interface/IDE.class b/bin/Interface/IDE.class
diff --git a/bin/Language/Parser$CUP$Parser$actions.class b/bin/Language/Parser$CUP$Parser$actions.class
diff --git a/bin/Language/Parser.class b/bin/Language/Parser.class
diff --git a/bin/Language/Parser.cup b/bin/Language/Parser.cup
@@ -101,9 +101,6 @@ non terminal String CHARACTER;
 non terminal String IDS;
 
 /* 5. Precedencias */
-precedence left TK_or;
-precedence left TK_concat;
-precedence left TK_positive, TK_kleene, TK_optional;
 
 /* 6. Gramatica Libre de Contexto */
 
@@ -155,12 +152,11 @@ CHARACTER ::=
     TK_kleene   :ch    {:RESULT = ch;:} ;
 
 OPERATION ::=
-    OPERATION:op1 TK_or     OPERATION:op2   {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
-    OPERATION:op1 TK_concat OPERATION:op2   {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
-    OPERATION:op1 TK_kleene                 {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
-    OPERATION:op1 TK_positive               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
-    OPERATION:op1 TK_optional               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
-    TK_lpar OPERATION:op TK_rpar            {:RESULT = op;                                                             :} |
+    TK_or       OPERATION:op1 OPERATION:op2 {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
+    TK_concat   OPERATION:op1 OPERATION:op2 {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
+    TK_kleene   OPERATION:op1               {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
+    TK_positive OPERATION:op1               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
+    TK_optional OPERATION:op1               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
     OPERAND:op                              {:RESULT = op;                                                             :} ;
 
 OPERAND ::=

diff --git a/bin/Language/ParserF$CUP$ParserF$actions.class b/bin/Language/ParserF$CUP$ParserF$actions.class
diff --git a/bin/Language/ParserF.class b/bin/Language/ParserF.class
diff --git a/bin/Language/ParserF.cup b/bin/Language/ParserF.cup
@@ -37,9 +37,6 @@ non terminal String CHARACTER;
 non terminal String IDS;
 
 /* 5. Precedencias */
-precedence left TK_or;
-precedence left TK_concat;
-precedence left TK_positive, TK_kleene, TK_optional;
 
 /* 6. Gramatica Libre de Contexto */
 
@@ -93,12 +90,11 @@ CHARACTER ::=
     TK_kleene   :ch    {:RESULT = ch;:} ;
 
 OPERATION ::=
-    OPERATION TK_or      :op {:painter.OPERATOR(opleft,opright);:} OPERATION      |
-    OPERATION TK_concat  :op {:painter.OPERATOR(opleft,opright);:} OPERATION      |
-    OPERATION TK_kleene  :op {:painter.OPERATOR(opleft,opright);:}                |
-    OPERATION TK_positive:op {:painter.OPERATOR(opleft,opright);:}                |
-    OPERATION TK_optional:op {:painter.OPERATOR(opleft,opright);:}                |
-    TK_lpar OPERATION TK_rpar                                                     |
+    TK_or      :op {:painter.OPERATOR(opleft,opright);:} OPERATION OPERATION      |
+    TK_concat  :op {:painter.OPERATOR(opleft,opright);:} OPERATION OPERATION      |
+    TK_kleene  :op {:painter.OPERATOR(opleft,opright);:} OPERATION                |
+    TK_positive:op {:painter.OPERATOR(opleft,opright);:} OPERATION                |
+    TK_optional:op {:painter.OPERATOR(opleft,opright);:} OPERATION                |
     OPERAND                                                                       ;
 
 OPERAND ::=

diff --git a/src/Interface/IDE.java b/src/Interface/IDE.java
@@ -226,7 +226,7 @@ void addComponents() {
         this.add(saveOLC);
     }
     void copyright() {
-        this.add(new Label(0,695,1390,15,"EXREGAN Infix",11));
+        this.add(new Label(0,695,1390,15,"EXREGAN Prefix",11));
         this.add(new Label(0,710,1390,15,"© Danny Hugo Bryan Tejaxún Pichiyá",11));
     }
     void addToolBar() {

diff --git a/src/Language/Parser.cup b/src/Language/Parser.cup
@@ -101,9 +101,6 @@ non terminal String CHARACTER;
 non terminal String IDS;
 
 /* 5. Precedencias */
-precedence left TK_or;
-precedence left TK_concat;
-precedence left TK_positive, TK_kleene, TK_optional;
 
 /* 6. Gramatica Libre de Contexto */
 
@@ -155,12 +152,11 @@ CHARACTER ::=
     TK_kleene   :ch    {:RESULT = ch;:} ;
 
 OPERATION ::=
-    OPERATION:op1 TK_or     OPERATION:op2   {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
-    OPERATION:op1 TK_concat OPERATION:op2   {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
-    OPERATION:op1 TK_kleene                 {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
-    OPERATION:op1 TK_positive               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
-    OPERATION:op1 TK_optional               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
-    TK_lpar OPERATION:op TK_rpar            {:RESULT = op;                                                             :} |
+    TK_or       OPERATION:op1 OPERATION:op2 {:RESULT = buildTree("|",op1,op2,op1.anulable || op2.anulable,Type.OR);    :} |
+    TK_concat   OPERATION:op1 OPERATION:op2 {:RESULT = buildTree(".",op1,op2,op1.anulable && op2.anulable,Type.CONCAT);:} |
+    TK_kleene   OPERATION:op1               {:RESULT = buildTree("*",op1,null,true,Type.KLEENE);                       :} |
+    TK_positive OPERATION:op1               {:RESULT = buildTree("+",op1,null,op1.anulable,Type.POSITIVE);             :} |
+    TK_optional OPERATION:op1               {:RESULT = buildTree("?",op1,null,true,Type.OPTIONAL);                     :} |
     OPERAND:op                              {:RESULT = op;                                                             :} ;
 
 OPERAND ::=