diff --git a/practica2/Practica2 David&Jose/Leeme.txt b/practica2/Practica2 David&Jose/Leeme.txt
index 1fa25cb..668eafd 100644
--- a/practica2/Practica2 David&Jose/Leeme.txt	
+++ b/practica2/Practica2 David&Jose/Leeme.txt	
@@ -1,2 +1,2 @@
 Autores: Jose Luis Pariente Martinez y David Heras Pino
-Código ejecutado y probado en OS X El Capitan 10.11.1 
\ No newline at end of file
+Código ejecutado y probado en MacOS X El Capitan 10.11.1 
\ No newline at end of file
diff --git a/practica2/Practica2 David&Jose/entrega/Leeme.txt b/practica2/Practica2 David&Jose/entrega/Leeme.txt
new file mode 100644
index 0000000..668eafd
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/Leeme.txt	
@@ -0,0 +1,2 @@
+Autores: Jose Luis Pariente Martinez y David Heras Pino
+Código ejecutado y probado en MacOS X El Capitan 10.11.1 
\ No newline at end of file
diff --git a/practica2/Practica2 David&Jose/entrega/practica2.exe b/practica2/Practica2 David&Jose/entrega/practica2.exe
new file mode 100755
index 0000000..0dcb4ab
Binary files /dev/null and b/practica2/Practica2 David&Jose/entrega/practica2.exe differ
diff --git a/practica2/Practica2 David&Jose/entrega/practica2.l b/practica2/Practica2 David&Jose/entrega/practica2.l
new file mode 100755
index 0000000..8b3da5e
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/practica2.l	
@@ -0,0 +1,116 @@
+%{
+#include "y.tab.h"
+#include <string.h>
+  
+int nLineas=1;
+%}
+
+entero	[0-9]+
+real	{entero}+[.]{entero}([eE][-+]?{entero})?
+iden	[a-zA-Z][a-zA-Z0-9]*
+cadena \"(\\.|[^\\"])*\"
+operador [+\-*/&|!<>%]
+cdc1 \"%d\"
+cdc2 \"%f\"
+cdc3 \"%c\"
+input [^\r\n]
+eol (\n|\r|\r\n)
+coment ("//"{input}*{eol}?)
+
+%%
+
+{entero}  {
+            return NUM_ENTERO;
+		      }
+
+{real}  { 
+          return NUM_REAL;
+        }
+
+{cdc1}  { 
+		  yylval.tipo = 1;
+          return CDC;
+        }    
+{cdc2}  { 
+		  yylval.tipo = 2;
+          return CDC;
+        }  
+{cdc3}  { 
+		  yylval.tipo = 3;
+          return CDC;
+        }   
+
+{cadena}  {
+            return CADENA;
+          }
+
+[ \t]	;
+
+"define"  {
+            return DEFINE;
+          }
+
+"int"     { 
+            return INT;
+          }
+
+"float"   {
+            return FLOAT;
+          }
+
+"char"    {
+            return CHAR;
+          }
+
+"int main()"    {
+                  return MAIN;
+                }
+
+"printf"  { 
+            return PRINTF;
+          }
+
+"scanf" {
+          return SCANF;
+        }
+
+"if"  { 
+        return IF;
+      }
+
+"else"  {
+          return ELSE;
+        }
+
+"while" { 
+          return WHILE;
+        }
+
+"for" { 
+        return FOR;
+      }
+
+{iden}    { 
+            strcpy(yylval.nombreId, yytext);
+            return ID;
+          }
+
+{operador}|"&&"|"||"|"=="|"<="|">="|"!="   { 
+                                             return OPERADOR;
+                                            }
+"++"|"--" { 
+            return OPERADOR2;
+          }
+{coment} { nLineas++; }
+
+\n  { nLineas++; }
+
+.	{
+    return yytext[0];
+  }
+
+%%
+
+int yywrap(){
+    return 1;
+}
diff --git a/practica2/Practica2 David&Jose/entrega/practica2.y b/practica2/Practica2 David&Jose/entrega/practica2.y
new file mode 100755
index 0000000..777c8e7
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/practica2.y	
@@ -0,0 +1,262 @@
+%{
+
+#include <string.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+void yyerror(const char* msg) {
+		fprintf(stderr, "%s\n", msg);
+}
+int yylex(void);
+FILE *yyin;
+
+int num_sim = 0;
+extern int nLineas;
+
+struct simbolo{
+		char nombre[30];
+		int tipo;
+		int cte;
+		int inicializado;
+};
+struct simbolo tablaSimbolos[50];
+int dim = 0;
+
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[30],int dim);
+
+int errores = 0;
+
+%}
+
+%union {
+		 int tipo; // 1.int 2.float 3.char
+		 char nombreId[30];
+	}
+
+%token  <nombreId> ID
+%token  DEFINE
+%token  NUM_ENTERO
+%token  NUM_REAL
+%token  CADENA
+%token  INT
+%token  FLOAT
+%token  CHAR
+%token  MAIN
+%token  OPERADOR
+%token  OPERADOR2
+%token  PRINTF
+%token  IF
+%token  FOR
+%token  ELSE
+%token  SCANF
+%token  WHILE
+%token  <tipo> CDC
+%type   <tipo> tipo valor_cte val expr
+%type   <nombreId> id
+
+%%
+programa:	declaracionesCtes main {if (errores > 0) {
+																		printf("\n Programa compilado con %d errores en %d lineas\n",errores,nLineas);
+																	}else{
+																		printf("\n Programa compilado sin errores y con %d lineas\n", nLineas);
+																	}	
+																 }
+
+						;
+declaracionesCtes: /*vacia*/
+									 | declaracionCte declaracionesCtes
+									 ;
+declaracionCte:    '#' DEFINE ID valor_cte  { 
+																							int pos = buscarSimbolo(tablaSimbolos, $3, dim);
+																							if (pos != dim){
+																									printf("\n ERROR lin %d: Constante redeclarado",nLineas);
+																									errores++;
+																							}
+																							else {
+																									//lo añado
+																									tablaSimbolos[dim].tipo = $4;
+																									tablaSimbolos[dim].cte  = 1;
+																									tablaSimbolos[dim].inicializado = 1;
+																									strcpy(tablaSimbolos[dim].nombre,$3);
+																									dim++;
+																							}
+																						}
+									 ;
+valor_cte:         NUM_ENTERO { $$ = 1; }
+									 | NUM_REAL { $$ = 2; }
+									 | CADENA   { $$ = 3; }
+									 ;
+declaracionVbles:  /*vacia*/
+									 | declaracionVble declaracionVbles
+									 ;
+declaracionVble:   tipo id ';'  { 
+																	int pos = buscarSimbolo(tablaSimbolos, $2, dim);
+																	if (pos != dim){
+																			printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																			errores++;
+																	}
+																	else {
+																			//lo añado
+																			tablaSimbolos[dim].tipo = $1;
+																			tablaSimbolos[dim].cte  = 0;
+																			tablaSimbolos[dim].inicializado = 0;
+																			strcpy(tablaSimbolos[dim].nombre,$2);
+																			dim++;
+																	}
+																}
+									 | tipo id '=' expr ';' {
+																						int pos = buscarSimbolo(tablaSimbolos, $2, dim);
+																						if (pos != dim){
+																								printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																								errores++;
+																						}
+																						else {
+																							if ($1 != $4){
+																								printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																								errores++;
+																							}else if ($4 != 4){ //el tipo 4 es indicador de que no existe la variable
+																							  //lo añado
+																								tablaSimbolos[dim].tipo = $1;
+																								tablaSimbolos[dim].cte  = 0;
+																								tablaSimbolos[dim].inicializado = 1;
+																								strcpy(tablaSimbolos[dim].nombre,$2);
+																								dim++;
+																							}
+																						}
+																          }									
+									 ;
+tipo:              INT     { $$ = 1; }
+									 | FLOAT { $$ = 2; }
+									 | CHAR  { $$ = 3; }
+									 ;
+id:                ID { strcpy($$, $1); }
+									 ;
+expr:              val { $$ = $1; }
+									 | val OPERADOR expr { 	if ($1 < $3)
+									 												{
+									 													$$ = $3;
+									 												}else{
+									 													$$ = $1;
+									 												}
+																			 }
+									 ;
+val:               ID         { int pos = buscarSimbolo(tablaSimbolos, $1, dim);
+																int tipo = tablaSimbolos[pos].tipo;
+																if (tipo == 0){
+																	printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																	errores++;
+																	tipo = 4;
+																}
+																if (tablaSimbolos[pos].inicializado == 0){
+																	printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, $1);
+																	errores++;
+																	tipo = 4;
+																}
+																$$ = tipo;
+															}
+									 | valor_cte { $$ = $1; }
+									 ;
+main:              MAIN '{' cuerpo '}'
+									 ;
+cuerpo: 					 declaracionVbles instrucciones
+									 ;
+instrucciones:     /*vacía*/
+									 | instruccion instrucciones
+									 ;
+instruccion:       asig ';'
+									 | visu ';'
+									 | lect ';'
+									 | cond 
+									 | repe 
+									 ;
+asig:              ID '=' expr {  int pos = buscarSimbolo(tablaSimbolos, $1, dim);
+																	int tipo = tablaSimbolos[pos].tipo;
+																	if (tipo == 0){
+																		printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																		errores++;
+																	}
+																	if (tablaSimbolos[pos].cte == 1){
+																		printf("\n ERROR lin %d: No se puede modificar el valor de una constante", nLineas);
+																		errores++;
+																	}
+																	if ((tipo == 1 && $3 == 2) || (tipo == 3 && $3 == 2)){ //Problemas con entero = float y char = float
+																		printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																		errores++;
+																	}
+
+																}
+									 | ID OPERADOR2
+									 ;
+visu:              PRINTF '(' listExpr ')'
+									 ;
+listExpr:          /*vacia*/
+									 | expr
+									 | expr ',' listExpr
+									 ;
+lect:              SCANF '(' CDC  ',' OPERADOR ID ')' { int pos = buscarSimbolo(tablaSimbolos, $6, dim);
+																												int tipo = tablaSimbolos[pos].tipo;
+																												if (tipo == 0){
+																													printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $6);
+																													errores++;
+																												}
+																												if ($3 != tipo && tipo != 0){
+																													printf("\n ERROR lin %d: Tipos incompatibles en scanf", nLineas);
+																													errores++;
+																												}																								
+																											}
+									 ;
+cond:              bloqueIF 
+									 | bloqueIF else
+									 ;
+bloqueIF:          IF '(' expr ')' '{' instrucciones '}' 
+									 ;
+else:              ELSE '{' instrucciones '}' 
+									 | ELSE cond 
+									 ;
+repe:              for 
+									 | while 
+									 ;
+for:               FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'  
+									 ;
+inicia:            /*vacia*/ 
+									 | asig
+									 ;
+expFOR:            /*vacia*/ 
+									 | expr
+									 ;
+increm:            /*vacia*/
+									 | ID OPERADOR2 { int pos = buscarSimbolo(tablaSimbolos, $1, dim); 
+									 									int tipo = tablaSimbolos[pos].tipo;
+																		if (tipo == 0){
+																			printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																			errores++;
+																		}
+																		else if (tablaSimbolos[pos].inicializado == 0){
+																			printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, $1);
+																			errores++;
+																		}
+									 								}
+									 ;
+while:             WHILE '(' expr ')' '{' instrucciones '}' 
+									 ;
+
+
+%%
+
+int main()
+{
+		yyin=fopen("practica2conErrores.c","r");
+		yyparse();
+ 
+}
+
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[50],int dim){
+		for (int i=0;i<dim;i++){
+				if (strcmp(nombre,tablaSimbolos[i].nombre) == 0){
+						return i;
+				}
+		}
+		return dim;
+}
+
diff --git a/practica2/Practica2 David&Jose/entrega/practica2conErrores.c b/practica2/Practica2 David&Jose/entrega/practica2conErrores.c
new file mode 100755
index 0000000..f2cea44
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/practica2conErrores.c	
@@ -0,0 +1,30 @@
+#define PI 3.1416
+#define NUMERO 15
+#define SALUDO "Hola"
+#define PI 4 //Error por redeclaración de constante
+
+int main(){
+	int caca;
+	int a = 8 + 8 + 9 + caca; //Error por variable no inicializada
+	float b;
+	char c;
+	int x = 0;
+
+	PI = 5.67; //Error por reasignación a una constante
+
+	scanf("%d", &a); //Error por variable no declarada
+	scanf("%d", &b); //Error de tipos incompatibles en scanf
+	scanf("%d", &caca);
+
+	if (noExisto < x){	//Error por variable no declarada
+		x++;
+	}
+
+	while (noExisto2 == 1){ //Error por variable no declarada
+		x++;
+	}
+
+	for (noExisto3 = 0; x<10; caca++){ //Error por variable no declarada y variable no inicializada
+		printf(noExisto4); //Error por variable no declarada
+	}
+}
diff --git a/practica2/Practica2 David&Jose/entrega/practica2sinErrores.c b/practica2/Practica2 David&Jose/entrega/practica2sinErrores.c
new file mode 100755
index 0000000..cc03133
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/practica2sinErrores.c	
@@ -0,0 +1,10 @@
+#define PI 3.1416
+#define NUMERO 15
+#define SALUDO "Hola"
+
+int main(){
+	int caca = 8;
+	int a = 8 + 8 + 9 + caca;
+	float b;
+	char c;
+}
diff --git a/practica2/Practica2 David&Jose/entrega/practicaYacc1516_JoseDavid.zip b/practica2/Practica2 David&Jose/entrega/practicaYacc1516_JoseDavid.zip
new file mode 100644
index 0000000..4eb549f
Binary files /dev/null and b/practica2/Practica2 David&Jose/entrega/practicaYacc1516_JoseDavid.zip differ
diff --git a/practica2/Practica2 David&Jose/entrega/y.output b/practica2/Practica2 David&Jose/entrega/y.output
new file mode 100644
index 0000000..2f14fce
--- /dev/null
+++ b/practica2/Practica2 David&Jose/entrega/y.output	
@@ -0,0 +1,1132 @@
+Grammar
+
+    0 $accept: programa $end
+
+    1 programa: declaracionesCtes main
+
+    2 declaracionesCtes: /* empty */
+    3                  | declaracionCte declaracionesCtes
+
+    4 declaracionCte: '#' DEFINE ID valor_cte
+
+    5 valor_cte: NUM_ENTERO
+    6          | NUM_REAL
+    7          | CADENA
+
+    8 declaracionVbles: /* empty */
+    9                 | declaracionVble declaracionVbles
+
+   10 declaracionVble: tipo id ';'
+   11                | tipo id '=' expr ';'
+
+   12 tipo: INT
+   13     | FLOAT
+   14     | CHAR
+
+   15 id: ID
+
+   16 expr: val
+   17     | val OPERADOR expr
+
+   18 val: ID
+   19    | valor_cte
+
+   20 main: MAIN '{' cuerpo '}'
+
+   21 cuerpo: declaracionVbles instrucciones
+
+   22 instrucciones: /* empty */
+   23              | instruccion instrucciones
+
+   24 instruccion: asig ';'
+   25            | visu ';'
+   26            | lect ';'
+   27            | cond
+   28            | repe
+
+   29 asig: ID '=' expr
+   30     | ID OPERADOR2
+
+   31 visu: PRINTF '(' listExpr ')'
+
+   32 listExpr: /* empty */
+   33         | expr
+   34         | expr ',' listExpr
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID ')'
+
+   36 cond: bloqueIF
+   37     | bloqueIF else
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones '}'
+
+   39 else: ELSE '{' instrucciones '}'
+   40     | ELSE cond
+
+   41 repe: for
+   42     | while
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+   44 inicia: /* empty */
+   45       | asig
+
+   46 expFOR: /* empty */
+   47       | expr
+
+   48 increm: /* empty */
+   49       | ID OPERADOR2
+
+   50 while: WHILE '(' expr ')' '{' instrucciones '}'
+
+
+Terminals, with rules where they appear
+
+$end (0) 0
+'#' (35) 4
+'(' (40) 31 35 38 43 50
+')' (41) 31 35 38 43 50
+',' (44) 34 35
+';' (59) 10 11 24 25 26 43
+'=' (61) 11 29
+'{' (123) 20 38 39 43 50
+'}' (125) 20 38 39 43 50
+error (256)
+ID (258) 4 15 18 29 30 35 49
+DEFINE (259) 4
+NUM_ENTERO (260) 5
+NUM_REAL (261) 6
+CADENA (262) 7
+INT (263) 12
+FLOAT (264) 13
+CHAR (265) 14
+MAIN (266) 20
+OPERADOR (267) 17 35
+OPERADOR2 (268) 30 49
+PRINTF (269) 31
+IF (270) 38
+FOR (271) 43
+ELSE (272) 39 40
+SCANF (273) 35
+WHILE (274) 50
+CDC (275) 35
+
+
+Nonterminals, with rules where they appear
+
+$accept (29)
+    on left: 0
+programa (30)
+    on left: 1, on right: 0
+declaracionesCtes (31)
+    on left: 2 3, on right: 1 3
+declaracionCte (32)
+    on left: 4, on right: 3
+valor_cte (33)
+    on left: 5 6 7, on right: 4 19
+declaracionVbles (34)
+    on left: 8 9, on right: 9 21
+declaracionVble (35)
+    on left: 10 11, on right: 9
+tipo (36)
+    on left: 12 13 14, on right: 10 11
+id (37)
+    on left: 15, on right: 10 11
+expr (38)
+    on left: 16 17, on right: 11 17 29 33 34 38 47 50
+val (39)
+    on left: 18 19, on right: 16 17
+main (40)
+    on left: 20, on right: 1
+cuerpo (41)
+    on left: 21, on right: 20
+instrucciones (42)
+    on left: 22 23, on right: 21 23 38 39 43 50
+instruccion (43)
+    on left: 24 25 26 27 28, on right: 23
+asig (44)
+    on left: 29 30, on right: 24 45
+visu (45)
+    on left: 31, on right: 25
+listExpr (46)
+    on left: 32 33 34, on right: 31 34
+lect (47)
+    on left: 35, on right: 26
+cond (48)
+    on left: 36 37, on right: 27 40
+bloqueIF (49)
+    on left: 38, on right: 36 37
+else (50)
+    on left: 39 40, on right: 37
+repe (51)
+    on left: 41 42, on right: 28
+for (52)
+    on left: 43, on right: 41
+inicia (53)
+    on left: 44 45, on right: 43
+expFOR (54)
+    on left: 46 47, on right: 43
+increm (55)
+    on left: 48 49, on right: 43
+while (56)
+    on left: 50, on right: 42
+
+
+state 0
+
+    0 $accept: . programa $end
+
+    '#'  shift, and go to state 1
+
+    $default  reduce using rule 2 (declaracionesCtes)
+
+    programa           go to state 2
+    declaracionesCtes  go to state 3
+    declaracionCte     go to state 4
+
+
+state 1
+
+    4 declaracionCte: '#' . DEFINE ID valor_cte
+
+    DEFINE  shift, and go to state 5
+
+
+state 2
+
+    0 $accept: programa . $end
+
+    $end  shift, and go to state 6
+
+
+state 3
+
+    1 programa: declaracionesCtes . main
+
+    MAIN  shift, and go to state 7
+
+    main  go to state 8
+
+
+state 4
+
+    3 declaracionesCtes: declaracionCte . declaracionesCtes
+
+    '#'  shift, and go to state 1
+
+    $default  reduce using rule 2 (declaracionesCtes)
+
+    declaracionesCtes  go to state 9
+    declaracionCte     go to state 4
+
+
+state 5
+
+    4 declaracionCte: '#' DEFINE . ID valor_cte
+
+    ID  shift, and go to state 10
+
+
+state 6
+
+    0 $accept: programa $end .
+
+    $default  accept
+
+
+state 7
+
+   20 main: MAIN . '{' cuerpo '}'
+
+    '{'  shift, and go to state 11
+
+
+state 8
+
+    1 programa: declaracionesCtes main .
+
+    $default  reduce using rule 1 (programa)
+
+
+state 9
+
+    3 declaracionesCtes: declaracionCte declaracionesCtes .
+
+    $default  reduce using rule 3 (declaracionesCtes)
+
+
+state 10
+
+    4 declaracionCte: '#' DEFINE ID . valor_cte
+
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 15
+
+
+state 11
+
+   20 main: MAIN '{' . cuerpo '}'
+
+    INT    shift, and go to state 16
+    FLOAT  shift, and go to state 17
+    CHAR   shift, and go to state 18
+
+    $default  reduce using rule 8 (declaracionVbles)
+
+    declaracionVbles  go to state 19
+    declaracionVble   go to state 20
+    tipo              go to state 21
+    cuerpo            go to state 22
+
+
+state 12
+
+    5 valor_cte: NUM_ENTERO .
+
+    $default  reduce using rule 5 (valor_cte)
+
+
+state 13
+
+    6 valor_cte: NUM_REAL .
+
+    $default  reduce using rule 6 (valor_cte)
+
+
+state 14
+
+    7 valor_cte: CADENA .
+
+    $default  reduce using rule 7 (valor_cte)
+
+
+state 15
+
+    4 declaracionCte: '#' DEFINE ID valor_cte .
+
+    $default  reduce using rule 4 (declaracionCte)
+
+
+state 16
+
+   12 tipo: INT .
+
+    $default  reduce using rule 12 (tipo)
+
+
+state 17
+
+   13 tipo: FLOAT .
+
+    $default  reduce using rule 13 (tipo)
+
+
+state 18
+
+   14 tipo: CHAR .
+
+    $default  reduce using rule 14 (tipo)
+
+
+state 19
+
+   21 cuerpo: declaracionVbles . instrucciones
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 29
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 20
+
+    9 declaracionVbles: declaracionVble . declaracionVbles
+
+    INT    shift, and go to state 16
+    FLOAT  shift, and go to state 17
+    CHAR   shift, and go to state 18
+
+    $default  reduce using rule 8 (declaracionVbles)
+
+    declaracionVbles  go to state 39
+    declaracionVble   go to state 20
+    tipo              go to state 21
+
+
+state 21
+
+   10 declaracionVble: tipo . id ';'
+   11                | tipo . id '=' expr ';'
+
+    ID  shift, and go to state 40
+
+    id  go to state 41
+
+
+state 22
+
+   20 main: MAIN '{' cuerpo . '}'
+
+    '}'  shift, and go to state 42
+
+
+state 23
+
+   29 asig: ID . '=' expr
+   30     | ID . OPERADOR2
+
+    OPERADOR2  shift, and go to state 43
+    '='        shift, and go to state 44
+
+
+state 24
+
+   31 visu: PRINTF . '(' listExpr ')'
+
+    '('  shift, and go to state 45
+
+
+state 25
+
+   38 bloqueIF: IF . '(' expr ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 46
+
+
+state 26
+
+   43 for: FOR . '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 47
+
+
+state 27
+
+   35 lect: SCANF . '(' CDC ',' OPERADOR ID ')'
+
+    '('  shift, and go to state 48
+
+
+state 28
+
+   50 while: WHILE . '(' expr ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 49
+
+
+state 29
+
+   21 cuerpo: declaracionVbles instrucciones .
+
+    $default  reduce using rule 21 (cuerpo)
+
+
+state 30
+
+   23 instrucciones: instruccion . instrucciones
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 50
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 31
+
+   24 instruccion: asig . ';'
+
+    ';'  shift, and go to state 51
+
+
+state 32
+
+   25 instruccion: visu . ';'
+
+    ';'  shift, and go to state 52
+
+
+state 33
+
+   26 instruccion: lect . ';'
+
+    ';'  shift, and go to state 53
+
+
+state 34
+
+   27 instruccion: cond .
+
+    $default  reduce using rule 27 (instruccion)
+
+
+state 35
+
+   36 cond: bloqueIF .
+   37     | bloqueIF . else
+
+    ELSE  shift, and go to state 54
+
+    $default  reduce using rule 36 (cond)
+
+    else  go to state 55
+
+
+state 36
+
+   28 instruccion: repe .
+
+    $default  reduce using rule 28 (instruccion)
+
+
+state 37
+
+   41 repe: for .
+
+    $default  reduce using rule 41 (repe)
+
+
+state 38
+
+   42 repe: while .
+
+    $default  reduce using rule 42 (repe)
+
+
+state 39
+
+    9 declaracionVbles: declaracionVble declaracionVbles .
+
+    $default  reduce using rule 9 (declaracionVbles)
+
+
+state 40
+
+   15 id: ID .
+
+    $default  reduce using rule 15 (id)
+
+
+state 41
+
+   10 declaracionVble: tipo id . ';'
+   11                | tipo id . '=' expr ';'
+
+    ';'  shift, and go to state 56
+    '='  shift, and go to state 57
+
+
+state 42
+
+   20 main: MAIN '{' cuerpo '}' .
+
+    $default  reduce using rule 20 (main)
+
+
+state 43
+
+   30 asig: ID OPERADOR2 .
+
+    $default  reduce using rule 30 (asig)
+
+
+state 44
+
+   29 asig: ID '=' . expr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 60
+    val        go to state 61
+
+
+state 45
+
+   31 visu: PRINTF '(' . listExpr ')'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 32 (listExpr)
+
+    valor_cte  go to state 59
+    expr       go to state 62
+    val        go to state 61
+    listExpr   go to state 63
+
+
+state 46
+
+   38 bloqueIF: IF '(' . expr ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 64
+    val        go to state 61
+
+
+state 47
+
+   43 for: FOR '(' . inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    ID  shift, and go to state 23
+
+    $default  reduce using rule 44 (inicia)
+
+    asig    go to state 65
+    inicia  go to state 66
+
+
+state 48
+
+   35 lect: SCANF '(' . CDC ',' OPERADOR ID ')'
+
+    CDC  shift, and go to state 67
+
+
+state 49
+
+   50 while: WHILE '(' . expr ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 68
+    val        go to state 61
+
+
+state 50
+
+   23 instrucciones: instruccion instrucciones .
+
+    $default  reduce using rule 23 (instrucciones)
+
+
+state 51
+
+   24 instruccion: asig ';' .
+
+    $default  reduce using rule 24 (instruccion)
+
+
+state 52
+
+   25 instruccion: visu ';' .
+
+    $default  reduce using rule 25 (instruccion)
+
+
+state 53
+
+   26 instruccion: lect ';' .
+
+    $default  reduce using rule 26 (instruccion)
+
+
+state 54
+
+   39 else: ELSE . '{' instrucciones '}'
+   40     | ELSE . cond
+
+    IF   shift, and go to state 25
+    '{'  shift, and go to state 69
+
+    cond      go to state 70
+    bloqueIF  go to state 35
+
+
+state 55
+
+   37 cond: bloqueIF else .
+
+    $default  reduce using rule 37 (cond)
+
+
+state 56
+
+   10 declaracionVble: tipo id ';' .
+
+    $default  reduce using rule 10 (declaracionVble)
+
+
+state 57
+
+   11 declaracionVble: tipo id '=' . expr ';'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 71
+    val        go to state 61
+
+
+state 58
+
+   18 val: ID .
+
+    $default  reduce using rule 18 (val)
+
+
+state 59
+
+   19 val: valor_cte .
+
+    $default  reduce using rule 19 (val)
+
+
+state 60
+
+   29 asig: ID '=' expr .
+
+    $default  reduce using rule 29 (asig)
+
+
+state 61
+
+   16 expr: val .
+   17     | val . OPERADOR expr
+
+    OPERADOR  shift, and go to state 72
+
+    $default  reduce using rule 16 (expr)
+
+
+state 62
+
+   33 listExpr: expr .
+   34         | expr . ',' listExpr
+
+    ','  shift, and go to state 73
+
+    $default  reduce using rule 33 (listExpr)
+
+
+state 63
+
+   31 visu: PRINTF '(' listExpr . ')'
+
+    ')'  shift, and go to state 74
+
+
+state 64
+
+   38 bloqueIF: IF '(' expr . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 75
+
+
+state 65
+
+   45 inicia: asig .
+
+    $default  reduce using rule 45 (inicia)
+
+
+state 66
+
+   43 for: FOR '(' inicia . ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    ';'  shift, and go to state 76
+
+
+state 67
+
+   35 lect: SCANF '(' CDC . ',' OPERADOR ID ')'
+
+    ','  shift, and go to state 77
+
+
+state 68
+
+   50 while: WHILE '(' expr . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 78
+
+
+state 69
+
+   39 else: ELSE '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 79
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 70
+
+   40 else: ELSE cond .
+
+    $default  reduce using rule 40 (else)
+
+
+state 71
+
+   11 declaracionVble: tipo id '=' expr . ';'
+
+    ';'  shift, and go to state 80
+
+
+state 72
+
+   17 expr: val OPERADOR . expr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 81
+    val        go to state 61
+
+
+state 73
+
+   34 listExpr: expr ',' . listExpr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 32 (listExpr)
+
+    valor_cte  go to state 59
+    expr       go to state 62
+    val        go to state 61
+    listExpr   go to state 82
+
+
+state 74
+
+   31 visu: PRINTF '(' listExpr ')' .
+
+    $default  reduce using rule 31 (visu)
+
+
+state 75
+
+   38 bloqueIF: IF '(' expr ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 83
+
+
+state 76
+
+   43 for: FOR '(' inicia ';' . expFOR ';' increm ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 46 (expFOR)
+
+    valor_cte  go to state 59
+    expr       go to state 84
+    val        go to state 61
+    expFOR     go to state 85
+
+
+state 77
+
+   35 lect: SCANF '(' CDC ',' . OPERADOR ID ')'
+
+    OPERADOR  shift, and go to state 86
+
+
+state 78
+
+   50 while: WHILE '(' expr ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 87
+
+
+state 79
+
+   39 else: ELSE '{' instrucciones . '}'
+
+    '}'  shift, and go to state 88
+
+
+state 80
+
+   11 declaracionVble: tipo id '=' expr ';' .
+
+    $default  reduce using rule 11 (declaracionVble)
+
+
+state 81
+
+   17 expr: val OPERADOR expr .
+
+    $default  reduce using rule 17 (expr)
+
+
+state 82
+
+   34 listExpr: expr ',' listExpr .
+
+    $default  reduce using rule 34 (listExpr)
+
+
+state 83
+
+   38 bloqueIF: IF '(' expr ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 89
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 84
+
+   47 expFOR: expr .
+
+    $default  reduce using rule 47 (expFOR)
+
+
+state 85
+
+   43 for: FOR '(' inicia ';' expFOR . ';' increm ')' '{' instrucciones '}'
+
+    ';'  shift, and go to state 90
+
+
+state 86
+
+   35 lect: SCANF '(' CDC ',' OPERADOR . ID ')'
+
+    ID  shift, and go to state 91
+
+
+state 87
+
+   50 while: WHILE '(' expr ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 92
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 88
+
+   39 else: ELSE '{' instrucciones '}' .
+
+    $default  reduce using rule 39 (else)
+
+
+state 89
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 93
+
+
+state 90
+
+   43 for: FOR '(' inicia ';' expFOR ';' . increm ')' '{' instrucciones '}'
+
+    ID  shift, and go to state 94
+
+    $default  reduce using rule 48 (increm)
+
+    increm  go to state 95
+
+
+state 91
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID . ')'
+
+    ')'  shift, and go to state 96
+
+
+state 92
+
+   50 while: WHILE '(' expr ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 97
+
+
+state 93
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 38 (bloqueIF)
+
+
+state 94
+
+   49 increm: ID . OPERADOR2
+
+    OPERADOR2  shift, and go to state 98
+
+
+state 95
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 99
+
+
+state 96
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID ')' .
+
+    $default  reduce using rule 35 (lect)
+
+
+state 97
+
+   50 while: WHILE '(' expr ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 50 (while)
+
+
+state 98
+
+   49 increm: ID OPERADOR2 .
+
+    $default  reduce using rule 49 (increm)
+
+
+state 99
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 100
+
+
+state 100
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 101
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 101
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 102
+
+
+state 102
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 43 (for)
diff --git a/practica2/Practica2 David&Jose/lex.yy.c b/practica2/Practica2 David&Jose/lex.yy.c
index bcb7a10..25fbe6c 100644
--- a/practica2/Practica2 David&Jose/lex.yy.c	
+++ b/practica2/Practica2 David&Jose/lex.yy.c	
@@ -360,8 +360,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
+#define YY_NUM_RULES 25
+#define YY_END_OF_BUFFER 26
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -369,17 +369,19 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[88] =
+static yyconst flex_int16_t yy_accept[92] =
     {   0,
-        0,    0,   24,   22,    5,   21,   18,   22,   18,   18,
-       18,   18,   18,    1,   18,   22,   18,   17,   17,   17,
-       17,   17,   17,   17,   17,   17,   18,   18,    0,    4,
-        0,    0,   19,   20,    0,    1,   17,   17,   17,   17,
-       17,   17,   13,   17,   17,   17,   17,    0,   20,   20,
-       20,    2,   17,   17,   17,   17,   16,    7,   17,   17,
-       17,    3,    0,    9,   17,   14,   17,    0,   17,   17,
-       17,    0,    2,   17,    8,    0,   17,   12,   15,    6,
-        0,   11,    0,    0,    0,   10,    0
+        0,    0,   26,   24,    7,   23,   20,   24,   20,   20,
+       20,   20,   20,    1,   20,   24,   20,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   20,   20,    0,    6,
+        0,    0,   21,   22,    0,    1,   19,   19,   19,   19,
+       19,   19,   15,   19,   19,   19,   19,    0,    0,    0,
+       22,   22,   22,    2,   19,   19,   19,   19,   18,    9,
+       19,   19,   19,    5,    3,    4,    0,   11,   19,   16,
+       19,    0,   19,   19,   19,    0,    2,   19,   10,    0,
+       19,   14,   17,    8,    0,   13,    0,    0,    0,   12,
+        0
+
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -422,74 +424,80 @@ static yyconst flex_int32_t yy_meta[41] =
         2,    2,    2,    2,    2,    2,    2,    2,    2,    1
     } ;
 
-static yyconst flex_int16_t yy_base[91] =
+static yyconst flex_int16_t yy_base[95] =
     {   0,
-        0,    0,  126,  127,  127,  127,  106,   34,  127,  115,
-      110,  108,  105,   28,  101,  100,   99,    0,   88,   89,
-       84,   13,   18,   78,   88,   83,   71,  127,   41,  127,
-       42,  107,  127,   49,   92,   39,    0,   84,   79,   69,
-       71,   68,    0,   65,   72,   77,   70,   43,   55,  127,
-       96,   52,   62,   67,   69,   71,    0,   89,   60,   59,
-       60,  127,   58,    0,   57,    0,   51,   56,   49,   58,
-       58,   67,   61,   50,    0,   52,   45,    0,    0,    0,
-       33,    0,   29,   51,   49,  127,  127,   79,   53,   81
+        0,    0,  130,  131,  131,  131,  110,   34,  131,  119,
+      114,  112,  109,   28,  105,  104,  103,    0,   92,   93,
+       88,   13,   18,   82,   92,   87,   75,  131,   41,  131,
+       42,  111,  131,   49,   96,   39,    0,   88,   83,   73,
+       75,   72,    0,   69,   76,   81,   74,   43,   48,   51,
+       56,  131,  100,   55,   66,   71,   73,   75,    0,   93,
+       64,   63,   64,  131,  131,  131,   62,    0,   61,    0,
+       55,   60,   53,   62,   62,   71,   70,   54,    0,   56,
+       50,    0,    0,    0,   43,    0,   36,   53,   51,  131,
+      131,   82,   59,   84
+
     } ;
 
-static yyconst flex_int16_t yy_def[91] =
+static yyconst flex_int16_t yy_def[95] =
     {   0,
-       87,    1,   87,   87,   87,   87,   87,   88,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   87,   87,   88,   87,
-       88,   88,   87,   90,   87,   87,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   88,   90,   87,
-       87,   87,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   87,   87,   89,   89,   89,   89,   87,   89,   89,
-       89,   87,   87,   89,   89,   87,   89,   89,   89,   89,
-       87,   89,   87,   87,   87,   87,    0,   87,   87,   87
+       91,    1,   91,   91,   91,   91,   91,   92,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   91,   91,   92,   91,
+       92,   92,   91,   94,   91,   91,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   92,   92,   92,
+       94,   91,   91,   91,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   91,   91,   91,   91,   93,   93,   93,
+       93,   91,   93,   93,   93,   91,   91,   93,   93,   91,
+       93,   93,   93,   93,   91,   93,   91,   91,   91,   91,
+        0,   91,   91,   91
+
     } ;
 
-static yyconst flex_int16_t yy_nxt[168] =
+static yyconst flex_int16_t yy_nxt[172] =
     {   0,
         4,    5,    6,    4,    5,    7,    8,    9,   10,    4,
         4,    9,   11,   12,    4,   13,   14,   15,   16,   17,
        18,   18,    4,   18,   19,   20,   21,   22,   18,   23,
        18,   18,   18,   18,   24,   18,   25,   18,   26,   27,
-       30,   31,   35,   41,   36,   43,   42,   30,   30,   62,
-       44,   50,   51,   35,   37,   36,   32,   50,   51,   86,
-       85,   84,   83,   32,   32,   32,   48,   48,   52,   48,
-       72,   72,   82,   63,   73,   81,   80,   73,   63,   29,
-       29,   49,   49,   73,   79,   78,   77,   76,   75,   74,
-       71,   70,   69,   68,   67,   66,   65,   64,   50,   61,
-
-       60,   59,   58,   57,   56,   55,   54,   53,   52,   87,
-       28,   47,   46,   45,   40,   39,   38,   28,   28,   28,
-       34,   33,   33,   28,   28,   87,    3,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87
+       30,   31,   35,   41,   36,   43,   42,   30,   30,   64,
+       44,   52,   53,   35,   65,   36,   32,   66,   52,   53,
+       37,   90,   89,   32,   32,   32,   48,   49,   88,   50,
+       32,   54,   87,   32,   76,   76,   67,   86,   77,   85,
+       84,   67,   29,   29,   51,   51,   77,   77,   83,   82,
+       81,   80,   79,   78,   75,   74,   73,   72,   71,   70,
+
+       69,   68,   52,   63,   62,   61,   60,   59,   58,   57,
+       56,   55,   54,   91,   28,   47,   46,   45,   40,   39,
+       38,   28,   28,   28,   34,   33,   33,   28,   28,   91,
+        3,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91
     } ;
 
-static yyconst flex_int16_t yy_chk[168] =
+static yyconst flex_int16_t yy_chk[172] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         8,    8,   14,   22,   14,   23,   22,   29,   31,   48,
-       23,   34,   34,   36,   89,   36,    8,   49,   49,   85,
-       84,   83,   81,   29,   31,   48,   31,   31,   52,   31,
-       63,   63,   77,   52,   63,   76,   74,   73,   52,   88,
-       88,   90,   90,   72,   71,   70,   69,   68,   67,   65,
-       61,   60,   59,   58,   56,   55,   54,   53,   51,   47,
-
-       46,   45,   44,   42,   41,   40,   39,   38,   35,   32,
-       27,   26,   25,   24,   21,   20,   19,   17,   16,   15,
-       13,   12,   11,   10,    7,    3,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   87,   87,   87,   87,   87
+       23,   34,   34,   36,   49,   36,    8,   50,   51,   51,
+       93,   89,   88,   29,   31,   48,   31,   31,   87,   31,
+       49,   54,   85,   50,   67,   67,   54,   81,   67,   80,
+       78,   54,   92,   92,   94,   94,   77,   76,   75,   74,
+       73,   72,   71,   69,   63,   62,   61,   60,   58,   57,
+
+       56,   55,   53,   47,   46,   45,   44,   42,   41,   40,
+       39,   38,   35,   32,   27,   26,   25,   24,   21,   20,
+       19,   17,   16,   15,   13,   12,   11,   10,    7,    3,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+       91
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -512,7 +520,7 @@ char *yytext;
 #include <string.h>
   
 int nLineas=1;
-#line 516 "lex.yy.c"
+#line 524 "lex.yy.c"
 
 #define INITIAL 0
 
@@ -694,10 +702,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 18 "practica2.l"
+#line 20 "practica2.l"
 
 
-#line 701 "lex.yy.c"
+#line 709 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -750,13 +758,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 88 )
+				if ( yy_current_state >= 92 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 127 );
+		while ( yy_base[yy_current_state] != 131 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -782,163 +790,179 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 20 "practica2.l"
-{ printf("\n %d NUM_ENTERO",nLineas);
+#line 22 "practica2.l"
+{
             return NUM_ENTERO;
 		      }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 24 "practica2.l"
-{ printf("\n %d NUM_REAL",nLineas);
+#line 26 "practica2.l"
+{ 
           return NUM_REAL;
         }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 28 "practica2.l"
-{ printf("\n %d CDC",nLineas);
-                  return CDC;
-        }     
+#line 30 "practica2.l"
+{ 
+		  yylval.tipo = 1;
+          return CDC;
+        }    
 	YY_BREAK
 case 4:
-/* rule 4 can match eol */
 YY_RULE_SETUP
-#line 32 "practica2.l"
-{ printf("\n %d CADENA",nLineas);
+#line 34 "practica2.l"
+{ 
+		  yylval.tipo = 2;
+          return CDC;
+        }  
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 38 "practica2.l"
+{ 
+		  yylval.tipo = 3;
+          return CDC;
+        }   
+	YY_BREAK
+case 6:
+/* rule 6 can match eol */
+YY_RULE_SETUP
+#line 43 "practica2.l"
+{
             return CADENA;
           }
 	YY_BREAK
-case 5:
+case 7:
 YY_RULE_SETUP
-#line 36 "practica2.l"
+#line 47 "practica2.l"
 ;
 	YY_BREAK
-case 6:
+case 8:
 YY_RULE_SETUP
-#line 38 "practica2.l"
-{ printf("\n %d DEFINE",nLineas);
+#line 49 "practica2.l"
+{
             return DEFINE;
           }
 	YY_BREAK
-case 7:
+case 9:
 YY_RULE_SETUP
-#line 42 "practica2.l"
-{ printf("\n %d INT",nLineas);
+#line 53 "practica2.l"
+{ 
             return INT;
           }
 	YY_BREAK
-case 8:
+case 10:
 YY_RULE_SETUP
-#line 46 "practica2.l"
-{ printf("\n %d FLOAT",nLineas);
+#line 57 "practica2.l"
+{
             return FLOAT;
           }
 	YY_BREAK
-case 9:
+case 11:
 YY_RULE_SETUP
-#line 50 "practica2.l"
-{ printf("\n %d CHAR",nLineas);
+#line 61 "practica2.l"
+{
             return CHAR;
           }
 	YY_BREAK
-case 10:
+case 12:
 YY_RULE_SETUP
-#line 54 "practica2.l"
-{ printf("\n %d MAIN",nLineas);
+#line 65 "practica2.l"
+{
                   return MAIN;
                 }
 	YY_BREAK
-case 11:
+case 13:
 YY_RULE_SETUP
-#line 58 "practica2.l"
-{ printf("\n %d PRINTF",nLineas);
+#line 69 "practica2.l"
+{ 
             return PRINTF;
           }
 	YY_BREAK
-case 12:
+case 14:
 YY_RULE_SETUP
-#line 62 "practica2.l"
-{ printf("\n %d SCANF",nLineas);
+#line 73 "practica2.l"
+{
           return SCANF;
         }
 	YY_BREAK
-case 13:
+case 15:
 YY_RULE_SETUP
-#line 66 "practica2.l"
-{ printf("\n %d IF",nLineas);
+#line 77 "practica2.l"
+{ 
         return IF;
       }
 	YY_BREAK
-case 14:
+case 16:
 YY_RULE_SETUP
-#line 70 "practica2.l"
-{ printf("\n %d ELSE",nLineas);
+#line 81 "practica2.l"
+{
           return ELSE;
         }
 	YY_BREAK
-case 15:
+case 17:
 YY_RULE_SETUP
-#line 74 "practica2.l"
-{ printf("\n %d WHILE",nLineas);
+#line 85 "practica2.l"
+{ 
           return WHILE;
         }
 	YY_BREAK
-case 16:
+case 18:
 YY_RULE_SETUP
-#line 78 "practica2.l"
-{ printf("\n %d FOR",nLineas);
+#line 89 "practica2.l"
+{ 
         return FOR;
       }
 	YY_BREAK
-case 17:
+case 19:
 YY_RULE_SETUP
-#line 82 "practica2.l"
-{ printf("\n %d ID",nLineas);
+#line 93 "practica2.l"
+{ 
+            strcpy(yylval.nombreId, yytext);
             return ID;
           }
 	YY_BREAK
-case 18:
+case 20:
 YY_RULE_SETUP
-#line 86 "practica2.l"
-{ printf("\n %d OPERADOR",nLineas);
+#line 98 "practica2.l"
+{ 
                                              return OPERADOR;
                                             }
 	YY_BREAK
-case 19:
+case 21:
 YY_RULE_SETUP
-#line 89 "practica2.l"
-{ printf("\n %d OPERADOR2",nLineas);
+#line 101 "practica2.l"
+{ 
             return OPERADOR2;
           }
 	YY_BREAK
-case 20:
-/* rule 20 can match eol */
+case 22:
+/* rule 22 can match eol */
 YY_RULE_SETUP
-#line 92 "practica2.l"
-{  printf("\n %d COMENTARIO",nLineas);
-
-         }
+#line 104 "practica2.l"
+{ nLineas++; }
 	YY_BREAK
-case 21:
-/* rule 21 can match eol */
+case 23:
+/* rule 23 can match eol */
 YY_RULE_SETUP
-#line 96 "practica2.l"
+#line 106 "practica2.l"
 { nLineas++; }
 	YY_BREAK
-case 22:
+case 24:
 YY_RULE_SETUP
-#line 98 "practica2.l"
-{ printf("\n %d %c",nLineas, yytext[0]);
+#line 108 "practica2.l"
+{
     return yytext[0];
   }
 	YY_BREAK
-case 23:
+case 25:
 YY_RULE_SETUP
-#line 102 "practica2.l"
+#line 112 "practica2.l"
 ECHO;
 	YY_BREAK
-#line 942 "lex.yy.c"
+#line 966 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1230,7 +1254,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 88 )
+			if ( yy_current_state >= 92 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1258,11 +1282,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 88 )
+		if ( yy_current_state >= 92 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 87);
+	yy_is_jam = (yy_current_state == 91);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1935,7 +1959,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 102 "practica2.l"
+#line 112 "practica2.l"
 
 
 
diff --git a/practica2/Practica2 David&Jose/practica2.c b/practica2/Practica2 David&Jose/practica2.c
deleted file mode 100755
index 52554f8..0000000
--- a/practica2/Practica2 David&Jose/practica2.c	
+++ /dev/null
@@ -1,51 +0,0 @@
-#define PI 3.1416
-#define NUMERO 15
-#define SALUDO "Hola"
-
-float c,d = 5.3 + 2.4;
-int a,b;
-
-int main(){
-    int g;
-    h = a;
-    g = a+5;
-    z = 5 && f;
-    printf("a a df",a,b,a+b);
-    scanf("%d",&a);
-    if(a==4){
-    	a++;
-    }
-
-    if(b<9){
-    	b=5;
-    }else if (b>9){
-    	b = a-5;
-    }
-
-    if(b<9){
-    	b=5;
-    }else {
-    	b = a-5;
-    }
-
-    for (a=1;a>6;a++){
-    	printf("y eso");
-    }
-
-	for (;a>6;){
-    	printf("y eso");
-    }
-
-    while(1){
-    	a++;
-    }
-
-    //Practica realizada por
-    //David Heras Pino
-    //Jose L Pariente Martinez
-    //Copyright 2016 ©
-
-
-
-
-}
diff --git a/practica2/Practica2 David&Jose/practica2.exe b/practica2/Practica2 David&Jose/practica2.exe
index 6eb4a7e..0dcb4ab 100755
Binary files a/practica2/Practica2 David&Jose/practica2.exe and b/practica2/Practica2 David&Jose/practica2.exe differ
diff --git a/practica2/Practica2 David&Jose/practica2.h b/practica2/Practica2 David&Jose/practica2.h
new file mode 100644
index 0000000..6179184
--- /dev/null
+++ b/practica2/Practica2 David&Jose/practica2.h	
@@ -0,0 +1,9 @@
+#define MAX_SIM 30 /*numero maximo de simbolos para la tabla*/
+
+struct simbolo {
+    char    id[20];      // nombre del id
+    int     tipo;     // 1.int 2.float 3.char
+    int     inic;     // 0 no  1 si
+}tabla_simbolos[MAX_SIM];
+
+struct simbolo *buscar_simbolo();
diff --git a/practica2/Practica2 David&Jose/practica2.l b/practica2/Practica2 David&Jose/practica2.l
index e3a2b4d..8b3da5e 100755
--- a/practica2/Practica2 David&Jose/practica2.l	
+++ b/practica2/Practica2 David&Jose/practica2.l	
@@ -10,92 +10,102 @@ real	{entero}+[.]{entero}([eE][-+]?{entero})?
 iden	[a-zA-Z][a-zA-Z0-9]*
 cadena \"(\\.|[^\\"])*\"
 operador [+\-*/&|!<>%]
-cdc \"(%d|%f|%c)\"
+cdc1 \"%d\"
+cdc2 \"%f\"
+cdc3 \"%c\"
 input [^\r\n]
 eol (\n|\r|\r\n)
 coment ("//"{input}*{eol}?)
 
 %%
 
-{entero}  { printf("\n %d NUM_ENTERO",nLineas);
+{entero}  {
             return NUM_ENTERO;
 		      }
 
-{real}  { printf("\n %d NUM_REAL",nLineas);
+{real}  { 
           return NUM_REAL;
         }
 
-{cdc}  { printf("\n %d CDC",nLineas);
-                  return CDC;
-        }     
-
-{cadena}  { printf("\n %d CADENA",nLineas);
+{cdc1}  { 
+		  yylval.tipo = 1;
+          return CDC;
+        }    
+{cdc2}  { 
+		  yylval.tipo = 2;
+          return CDC;
+        }  
+{cdc3}  { 
+		  yylval.tipo = 3;
+          return CDC;
+        }   
+
+{cadena}  {
             return CADENA;
           }
 
 [ \t]	;
 
-"define"  { printf("\n %d DEFINE",nLineas);
+"define"  {
             return DEFINE;
           }
 
-"int"     { printf("\n %d INT",nLineas);
+"int"     { 
             return INT;
           }
 
-"float"   { printf("\n %d FLOAT",nLineas);
+"float"   {
             return FLOAT;
           }
 
-"char"    { printf("\n %d CHAR",nLineas);
+"char"    {
             return CHAR;
           }
 
-"int main()"    { printf("\n %d MAIN",nLineas);
+"int main()"    {
                   return MAIN;
                 }
 
-"printf"  { printf("\n %d PRINTF",nLineas);
+"printf"  { 
             return PRINTF;
           }
 
-"scanf" { printf("\n %d SCANF",nLineas);
+"scanf" {
           return SCANF;
         }
 
-"if"  { printf("\n %d IF",nLineas);
+"if"  { 
         return IF;
       }
 
-"else"  { printf("\n %d ELSE",nLineas);
+"else"  {
           return ELSE;
         }
 
-"while" { printf("\n %d WHILE",nLineas);
+"while" { 
           return WHILE;
         }
 
-"for" { printf("\n %d FOR",nLineas);
+"for" { 
         return FOR;
       }
 
-{iden}    { printf("\n %d ID",nLineas);
+{iden}    { 
+            strcpy(yylval.nombreId, yytext);
             return ID;
           }
 
-{operador}|"&&"|"||"|"=="|"<="|">="|"!="   { printf("\n %d OPERADOR",nLineas);
+{operador}|"&&"|"||"|"=="|"<="|">="|"!="   { 
                                              return OPERADOR;
                                             }
-"++"|"--" { printf("\n %d OPERADOR2",nLineas);
+"++"|"--" { 
             return OPERADOR2;
           }
-{coment} {  printf("\n %d COMENTARIO",nLineas);
-
-         }
+{coment} { nLineas++; }
 
 \n  { nLineas++; }
 
-.	{ printf("\n %d %c",nLineas, yytext[0]);
+.	{
     return yytext[0];
   }
 
diff --git a/practica2/Practica2 David&Jose/practica2.y b/practica2/Practica2 David&Jose/practica2.y
index 19ea69f..777c8e7 100755
--- a/practica2/Practica2 David&Jose/practica2.y	
+++ b/practica2/Practica2 David&Jose/practica2.y	
@@ -6,15 +6,35 @@
 #include <stdio.h>
 
 void yyerror(const char* msg) {
-    fprintf(stderr, "%s\n", msg);
+		fprintf(stderr, "%s\n", msg);
 }
 int yylex(void);
 FILE *yyin;
 
+int num_sim = 0;
 extern int nLineas;
 
+struct simbolo{
+		char nombre[30];
+		int tipo;
+		int cte;
+		int inicializado;
+};
+struct simbolo tablaSimbolos[50];
+int dim = 0;
+
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[30],int dim);
+
+int errores = 0;
+
 %}
-%token  ID
+
+%union {
+		 int tipo; // 1.int 2.float 3.char
+		 char nombreId[30];
+	}
+
+%token  <nombreId> ID
 %token  DEFINE
 %token  NUM_ENTERO
 %token  NUM_REAL
@@ -31,99 +51,212 @@ extern int nLineas;
 %token  ELSE
 %token  SCANF
 %token  WHILE
-%token  CDC
-
+%token  <tipo> CDC
+%type   <tipo> tipo valor_cte val expr
+%type   <nombreId> id
 
 %%
-programa:	declaracionesCtes declaracionVbles main {printf("\n Todo correcto numero de lineas %d\n",nLineas);}
-            ;
+programa:	declaracionesCtes main {if (errores > 0) {
+																		printf("\n Programa compilado con %d errores en %d lineas\n",errores,nLineas);
+																	}else{
+																		printf("\n Programa compilado sin errores y con %d lineas\n", nLineas);
+																	}	
+																 }
+
+						;
 declaracionesCtes: /*vacia*/
-                   | declaracionCte declaracionesCtes
-                   ;
-declaracionCte:    '#' DEFINE ID valor_cte {printf("\nDeclaracion cte");}
-                   ;
-valor_cte:         NUM_ENTERO
-                   | NUM_REAL
-                   | CADENA
-                   ;
+									 | declaracionCte declaracionesCtes
+									 ;
+declaracionCte:    '#' DEFINE ID valor_cte  { 
+																							int pos = buscarSimbolo(tablaSimbolos, $3, dim);
+																							if (pos != dim){
+																									printf("\n ERROR lin %d: Constante redeclarado",nLineas);
+																									errores++;
+																							}
+																							else {
+																									//lo añado
+																									tablaSimbolos[dim].tipo = $4;
+																									tablaSimbolos[dim].cte  = 1;
+																									tablaSimbolos[dim].inicializado = 1;
+																									strcpy(tablaSimbolos[dim].nombre,$3);
+																									dim++;
+																							}
+																						}
+									 ;
+valor_cte:         NUM_ENTERO { $$ = 1; }
+									 | NUM_REAL { $$ = 2; }
+									 | CADENA   { $$ = 3; }
+									 ;
 declaracionVbles:  /*vacia*/
-                   | declaracionVble declaracionVbles
-                   ;
-declaracionVble:   tipo listID ';' {printf("\nDeclaracion vble");}
-                   ;
-tipo:              INT
-                   | FLOAT
-                   | CHAR
-                   ;
-listID:            id
-                   | id ',' listID
-                   ;
-id:                ID
-                   | asig
-                   ;
+									 | declaracionVble declaracionVbles
+									 ;
+declaracionVble:   tipo id ';'  { 
+																	int pos = buscarSimbolo(tablaSimbolos, $2, dim);
+																	if (pos != dim){
+																			printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																			errores++;
+																	}
+																	else {
+																			//lo añado
+																			tablaSimbolos[dim].tipo = $1;
+																			tablaSimbolos[dim].cte  = 0;
+																			tablaSimbolos[dim].inicializado = 0;
+																			strcpy(tablaSimbolos[dim].nombre,$2);
+																			dim++;
+																	}
+																}
+									 | tipo id '=' expr ';' {
+																						int pos = buscarSimbolo(tablaSimbolos, $2, dim);
+																						if (pos != dim){
+																								printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																								errores++;
+																						}
+																						else {
+																							if ($1 != $4){
+																								printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																								errores++;
+																							}else if ($4 != 4){ //el tipo 4 es indicador de que no existe la variable
+																							  //lo añado
+																								tablaSimbolos[dim].tipo = $1;
+																								tablaSimbolos[dim].cte  = 0;
+																								tablaSimbolos[dim].inicializado = 1;
+																								strcpy(tablaSimbolos[dim].nombre,$2);
+																								dim++;
+																							}
+																						}
+																          }									
+									 ;
+tipo:              INT     { $$ = 1; }
+									 | FLOAT { $$ = 2; }
+									 | CHAR  { $$ = 3; }
+									 ;
+id:                ID { strcpy($$, $1); }
+									 ;
+expr:              val { $$ = $1; }
+									 | val OPERADOR expr { 	if ($1 < $3)
+									 												{
+									 													$$ = $3;
+									 												}else{
+									 													$$ = $1;
+									 												}
+																			 }
+									 ;
+val:               ID         { int pos = buscarSimbolo(tablaSimbolos, $1, dim);
+																int tipo = tablaSimbolos[pos].tipo;
+																if (tipo == 0){
+																	printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																	errores++;
+																	tipo = 4;
+																}
+																if (tablaSimbolos[pos].inicializado == 0){
+																	printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, $1);
+																	errores++;
+																	tipo = 4;
+																}
+																$$ = tipo;
+															}
+									 | valor_cte { $$ = $1; }
+									 ;
 main:              MAIN '{' cuerpo '}'
-                   ;
-cuerpo:            declaracionVbles instrucciones
-                   ;
-instrucciones:     instruccion
-                   | instruccion instrucciones
-                   ;
-instruccion:       asig ';' {printf("\nAsignacion");}
-                   | visu ';' {printf("\nVisualizacion");}
-                   | lect ';' {printf("\nLectura");}
-                   | cond {printf("\nCondicion");}
-                   | repe 
-                   ;
-asig:              ID '=' expr
-                   | ID OPERADOR2
-                   ;
-expr:              val
-                   | val OPERADOR expr
-                   ;
-val:               ID
-                   | valor_cte
-                   ;
+									 ;
+cuerpo: 					 declaracionVbles instrucciones
+									 ;
+instrucciones:     /*vacía*/
+									 | instruccion instrucciones
+									 ;
+instruccion:       asig ';'
+									 | visu ';'
+									 | lect ';'
+									 | cond 
+									 | repe 
+									 ;
+asig:              ID '=' expr {  int pos = buscarSimbolo(tablaSimbolos, $1, dim);
+																	int tipo = tablaSimbolos[pos].tipo;
+																	if (tipo == 0){
+																		printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																		errores++;
+																	}
+																	if (tablaSimbolos[pos].cte == 1){
+																		printf("\n ERROR lin %d: No se puede modificar el valor de una constante", nLineas);
+																		errores++;
+																	}
+																	if ((tipo == 1 && $3 == 2) || (tipo == 3 && $3 == 2)){ //Problemas con entero = float y char = float
+																		printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																		errores++;
+																	}
+
+																}
+									 | ID OPERADOR2
+									 ;
 visu:              PRINTF '(' listExpr ')'
-                   ;
+									 ;
 listExpr:          /*vacia*/
-                   | expr
-                   | expr ',' listExpr
-                   ;
-lect:              SCANF '(' CDC  ',' OPERADOR ID ')'
-                   ;
-cond:              bloqueIF {printf("\nBloque IF");}
-                   | bloqueIF else {printf("\nBloque IF+ELSE");}
-                   ;
+									 | expr
+									 | expr ',' listExpr
+									 ;
+lect:              SCANF '(' CDC  ',' OPERADOR ID ')' { int pos = buscarSimbolo(tablaSimbolos, $6, dim);
+																												int tipo = tablaSimbolos[pos].tipo;
+																												if (tipo == 0){
+																													printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $6);
+																													errores++;
+																												}
+																												if ($3 != tipo && tipo != 0){
+																													printf("\n ERROR lin %d: Tipos incompatibles en scanf", nLineas);
+																													errores++;
+																												}																								
+																											}
+									 ;
+cond:              bloqueIF 
+									 | bloqueIF else
+									 ;
 bloqueIF:          IF '(' expr ')' '{' instrucciones '}' 
-                   ;
+									 ;
 else:              ELSE '{' instrucciones '}' 
-                   | ELSE cond 
-                   ;
-repe:              for {printf("\nRepeticion: bloque FOR");}
-                   | while {printf("\nRepeticion: bloque WHILE");}
-                   ;
+									 | ELSE cond 
+									 ;
+repe:              for 
+									 | while 
+									 ;
 for:               FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'  
-                   ;
+									 ;
 inicia:            /*vacia*/ 
-                   | asig
-                   ;
+									 | asig
+									 ;
 expFOR:            /*vacia*/ 
-                   | expr
-                   ;
+									 | expr
+									 ;
 increm:            /*vacia*/
-                   | ID OPERADOR2
-                   ;
+									 | ID OPERADOR2 { int pos = buscarSimbolo(tablaSimbolos, $1, dim); 
+									 									int tipo = tablaSimbolos[pos].tipo;
+																		if (tipo == 0){
+																			printf("\n ERROR lin %d: Variable %s no declarada", nLineas, $1);
+																			errores++;
+																		}
+																		else if (tablaSimbolos[pos].inicializado == 0){
+																			printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, $1);
+																			errores++;
+																		}
+									 								}
+									 ;
 while:             WHILE '(' expr ')' '{' instrucciones '}' 
-                   ;
+									 ;
 
 
 %%
 
 int main()
 {
-    yyin=fopen("practica2.c","r");
-    yyparse();
+		yyin=fopen("practica2conErrores.c","r");
+		yyparse();
  
 }
 
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[50],int dim){
+		for (int i=0;i<dim;i++){
+				if (strcmp(nombre,tablaSimbolos[i].nombre) == 0){
+						return i;
+				}
+		}
+		return dim;
+}
 
diff --git a/practica2/Practica2 David&Jose/practica2conErrores.c b/practica2/Practica2 David&Jose/practica2conErrores.c
new file mode 100755
index 0000000..f2cea44
--- /dev/null
+++ b/practica2/Practica2 David&Jose/practica2conErrores.c	
@@ -0,0 +1,30 @@
+#define PI 3.1416
+#define NUMERO 15
+#define SALUDO "Hola"
+#define PI 4 //Error por redeclaración de constante
+
+int main(){
+	int caca;
+	int a = 8 + 8 + 9 + caca; //Error por variable no inicializada
+	float b;
+	char c;
+	int x = 0;
+
+	PI = 5.67; //Error por reasignación a una constante
+
+	scanf("%d", &a); //Error por variable no declarada
+	scanf("%d", &b); //Error de tipos incompatibles en scanf
+	scanf("%d", &caca);
+
+	if (noExisto < x){	//Error por variable no declarada
+		x++;
+	}
+
+	while (noExisto2 == 1){ //Error por variable no declarada
+		x++;
+	}
+
+	for (noExisto3 = 0; x<10; caca++){ //Error por variable no declarada y variable no inicializada
+		printf(noExisto4); //Error por variable no declarada
+	}
+}
diff --git a/practica2/Practica2 David&Jose/practica2sinErrores.c b/practica2/Practica2 David&Jose/practica2sinErrores.c
new file mode 100755
index 0000000..cc03133
--- /dev/null
+++ b/practica2/Practica2 David&Jose/practica2sinErrores.c	
@@ -0,0 +1,10 @@
+#define PI 3.1416
+#define NUMERO 15
+#define SALUDO "Hola"
+
+int main(){
+	int caca = 8;
+	int a = 8 + 8 + 9 + caca;
+	float b;
+	char c;
+}
diff --git a/practica2/Practica2 David&Jose/y.output b/practica2/Practica2 David&Jose/y.output
new file mode 100644
index 0000000..2f14fce
--- /dev/null
+++ b/practica2/Practica2 David&Jose/y.output	
@@ -0,0 +1,1132 @@
+Grammar
+
+    0 $accept: programa $end
+
+    1 programa: declaracionesCtes main
+
+    2 declaracionesCtes: /* empty */
+    3                  | declaracionCte declaracionesCtes
+
+    4 declaracionCte: '#' DEFINE ID valor_cte
+
+    5 valor_cte: NUM_ENTERO
+    6          | NUM_REAL
+    7          | CADENA
+
+    8 declaracionVbles: /* empty */
+    9                 | declaracionVble declaracionVbles
+
+   10 declaracionVble: tipo id ';'
+   11                | tipo id '=' expr ';'
+
+   12 tipo: INT
+   13     | FLOAT
+   14     | CHAR
+
+   15 id: ID
+
+   16 expr: val
+   17     | val OPERADOR expr
+
+   18 val: ID
+   19    | valor_cte
+
+   20 main: MAIN '{' cuerpo '}'
+
+   21 cuerpo: declaracionVbles instrucciones
+
+   22 instrucciones: /* empty */
+   23              | instruccion instrucciones
+
+   24 instruccion: asig ';'
+   25            | visu ';'
+   26            | lect ';'
+   27            | cond
+   28            | repe
+
+   29 asig: ID '=' expr
+   30     | ID OPERADOR2
+
+   31 visu: PRINTF '(' listExpr ')'
+
+   32 listExpr: /* empty */
+   33         | expr
+   34         | expr ',' listExpr
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID ')'
+
+   36 cond: bloqueIF
+   37     | bloqueIF else
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones '}'
+
+   39 else: ELSE '{' instrucciones '}'
+   40     | ELSE cond
+
+   41 repe: for
+   42     | while
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+   44 inicia: /* empty */
+   45       | asig
+
+   46 expFOR: /* empty */
+   47       | expr
+
+   48 increm: /* empty */
+   49       | ID OPERADOR2
+
+   50 while: WHILE '(' expr ')' '{' instrucciones '}'
+
+
+Terminals, with rules where they appear
+
+$end (0) 0
+'#' (35) 4
+'(' (40) 31 35 38 43 50
+')' (41) 31 35 38 43 50
+',' (44) 34 35
+';' (59) 10 11 24 25 26 43
+'=' (61) 11 29
+'{' (123) 20 38 39 43 50
+'}' (125) 20 38 39 43 50
+error (256)
+ID (258) 4 15 18 29 30 35 49
+DEFINE (259) 4
+NUM_ENTERO (260) 5
+NUM_REAL (261) 6
+CADENA (262) 7
+INT (263) 12
+FLOAT (264) 13
+CHAR (265) 14
+MAIN (266) 20
+OPERADOR (267) 17 35
+OPERADOR2 (268) 30 49
+PRINTF (269) 31
+IF (270) 38
+FOR (271) 43
+ELSE (272) 39 40
+SCANF (273) 35
+WHILE (274) 50
+CDC (275) 35
+
+
+Nonterminals, with rules where they appear
+
+$accept (29)
+    on left: 0
+programa (30)
+    on left: 1, on right: 0
+declaracionesCtes (31)
+    on left: 2 3, on right: 1 3
+declaracionCte (32)
+    on left: 4, on right: 3
+valor_cte (33)
+    on left: 5 6 7, on right: 4 19
+declaracionVbles (34)
+    on left: 8 9, on right: 9 21
+declaracionVble (35)
+    on left: 10 11, on right: 9
+tipo (36)
+    on left: 12 13 14, on right: 10 11
+id (37)
+    on left: 15, on right: 10 11
+expr (38)
+    on left: 16 17, on right: 11 17 29 33 34 38 47 50
+val (39)
+    on left: 18 19, on right: 16 17
+main (40)
+    on left: 20, on right: 1
+cuerpo (41)
+    on left: 21, on right: 20
+instrucciones (42)
+    on left: 22 23, on right: 21 23 38 39 43 50
+instruccion (43)
+    on left: 24 25 26 27 28, on right: 23
+asig (44)
+    on left: 29 30, on right: 24 45
+visu (45)
+    on left: 31, on right: 25
+listExpr (46)
+    on left: 32 33 34, on right: 31 34
+lect (47)
+    on left: 35, on right: 26
+cond (48)
+    on left: 36 37, on right: 27 40
+bloqueIF (49)
+    on left: 38, on right: 36 37
+else (50)
+    on left: 39 40, on right: 37
+repe (51)
+    on left: 41 42, on right: 28
+for (52)
+    on left: 43, on right: 41
+inicia (53)
+    on left: 44 45, on right: 43
+expFOR (54)
+    on left: 46 47, on right: 43
+increm (55)
+    on left: 48 49, on right: 43
+while (56)
+    on left: 50, on right: 42
+
+
+state 0
+
+    0 $accept: . programa $end
+
+    '#'  shift, and go to state 1
+
+    $default  reduce using rule 2 (declaracionesCtes)
+
+    programa           go to state 2
+    declaracionesCtes  go to state 3
+    declaracionCte     go to state 4
+
+
+state 1
+
+    4 declaracionCte: '#' . DEFINE ID valor_cte
+
+    DEFINE  shift, and go to state 5
+
+
+state 2
+
+    0 $accept: programa . $end
+
+    $end  shift, and go to state 6
+
+
+state 3
+
+    1 programa: declaracionesCtes . main
+
+    MAIN  shift, and go to state 7
+
+    main  go to state 8
+
+
+state 4
+
+    3 declaracionesCtes: declaracionCte . declaracionesCtes
+
+    '#'  shift, and go to state 1
+
+    $default  reduce using rule 2 (declaracionesCtes)
+
+    declaracionesCtes  go to state 9
+    declaracionCte     go to state 4
+
+
+state 5
+
+    4 declaracionCte: '#' DEFINE . ID valor_cte
+
+    ID  shift, and go to state 10
+
+
+state 6
+
+    0 $accept: programa $end .
+
+    $default  accept
+
+
+state 7
+
+   20 main: MAIN . '{' cuerpo '}'
+
+    '{'  shift, and go to state 11
+
+
+state 8
+
+    1 programa: declaracionesCtes main .
+
+    $default  reduce using rule 1 (programa)
+
+
+state 9
+
+    3 declaracionesCtes: declaracionCte declaracionesCtes .
+
+    $default  reduce using rule 3 (declaracionesCtes)
+
+
+state 10
+
+    4 declaracionCte: '#' DEFINE ID . valor_cte
+
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 15
+
+
+state 11
+
+   20 main: MAIN '{' . cuerpo '}'
+
+    INT    shift, and go to state 16
+    FLOAT  shift, and go to state 17
+    CHAR   shift, and go to state 18
+
+    $default  reduce using rule 8 (declaracionVbles)
+
+    declaracionVbles  go to state 19
+    declaracionVble   go to state 20
+    tipo              go to state 21
+    cuerpo            go to state 22
+
+
+state 12
+
+    5 valor_cte: NUM_ENTERO .
+
+    $default  reduce using rule 5 (valor_cte)
+
+
+state 13
+
+    6 valor_cte: NUM_REAL .
+
+    $default  reduce using rule 6 (valor_cte)
+
+
+state 14
+
+    7 valor_cte: CADENA .
+
+    $default  reduce using rule 7 (valor_cte)
+
+
+state 15
+
+    4 declaracionCte: '#' DEFINE ID valor_cte .
+
+    $default  reduce using rule 4 (declaracionCte)
+
+
+state 16
+
+   12 tipo: INT .
+
+    $default  reduce using rule 12 (tipo)
+
+
+state 17
+
+   13 tipo: FLOAT .
+
+    $default  reduce using rule 13 (tipo)
+
+
+state 18
+
+   14 tipo: CHAR .
+
+    $default  reduce using rule 14 (tipo)
+
+
+state 19
+
+   21 cuerpo: declaracionVbles . instrucciones
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 29
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 20
+
+    9 declaracionVbles: declaracionVble . declaracionVbles
+
+    INT    shift, and go to state 16
+    FLOAT  shift, and go to state 17
+    CHAR   shift, and go to state 18
+
+    $default  reduce using rule 8 (declaracionVbles)
+
+    declaracionVbles  go to state 39
+    declaracionVble   go to state 20
+    tipo              go to state 21
+
+
+state 21
+
+   10 declaracionVble: tipo . id ';'
+   11                | tipo . id '=' expr ';'
+
+    ID  shift, and go to state 40
+
+    id  go to state 41
+
+
+state 22
+
+   20 main: MAIN '{' cuerpo . '}'
+
+    '}'  shift, and go to state 42
+
+
+state 23
+
+   29 asig: ID . '=' expr
+   30     | ID . OPERADOR2
+
+    OPERADOR2  shift, and go to state 43
+    '='        shift, and go to state 44
+
+
+state 24
+
+   31 visu: PRINTF . '(' listExpr ')'
+
+    '('  shift, and go to state 45
+
+
+state 25
+
+   38 bloqueIF: IF . '(' expr ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 46
+
+
+state 26
+
+   43 for: FOR . '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 47
+
+
+state 27
+
+   35 lect: SCANF . '(' CDC ',' OPERADOR ID ')'
+
+    '('  shift, and go to state 48
+
+
+state 28
+
+   50 while: WHILE . '(' expr ')' '{' instrucciones '}'
+
+    '('  shift, and go to state 49
+
+
+state 29
+
+   21 cuerpo: declaracionVbles instrucciones .
+
+    $default  reduce using rule 21 (cuerpo)
+
+
+state 30
+
+   23 instrucciones: instruccion . instrucciones
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 50
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 31
+
+   24 instruccion: asig . ';'
+
+    ';'  shift, and go to state 51
+
+
+state 32
+
+   25 instruccion: visu . ';'
+
+    ';'  shift, and go to state 52
+
+
+state 33
+
+   26 instruccion: lect . ';'
+
+    ';'  shift, and go to state 53
+
+
+state 34
+
+   27 instruccion: cond .
+
+    $default  reduce using rule 27 (instruccion)
+
+
+state 35
+
+   36 cond: bloqueIF .
+   37     | bloqueIF . else
+
+    ELSE  shift, and go to state 54
+
+    $default  reduce using rule 36 (cond)
+
+    else  go to state 55
+
+
+state 36
+
+   28 instruccion: repe .
+
+    $default  reduce using rule 28 (instruccion)
+
+
+state 37
+
+   41 repe: for .
+
+    $default  reduce using rule 41 (repe)
+
+
+state 38
+
+   42 repe: while .
+
+    $default  reduce using rule 42 (repe)
+
+
+state 39
+
+    9 declaracionVbles: declaracionVble declaracionVbles .
+
+    $default  reduce using rule 9 (declaracionVbles)
+
+
+state 40
+
+   15 id: ID .
+
+    $default  reduce using rule 15 (id)
+
+
+state 41
+
+   10 declaracionVble: tipo id . ';'
+   11                | tipo id . '=' expr ';'
+
+    ';'  shift, and go to state 56
+    '='  shift, and go to state 57
+
+
+state 42
+
+   20 main: MAIN '{' cuerpo '}' .
+
+    $default  reduce using rule 20 (main)
+
+
+state 43
+
+   30 asig: ID OPERADOR2 .
+
+    $default  reduce using rule 30 (asig)
+
+
+state 44
+
+   29 asig: ID '=' . expr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 60
+    val        go to state 61
+
+
+state 45
+
+   31 visu: PRINTF '(' . listExpr ')'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 32 (listExpr)
+
+    valor_cte  go to state 59
+    expr       go to state 62
+    val        go to state 61
+    listExpr   go to state 63
+
+
+state 46
+
+   38 bloqueIF: IF '(' . expr ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 64
+    val        go to state 61
+
+
+state 47
+
+   43 for: FOR '(' . inicia ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    ID  shift, and go to state 23
+
+    $default  reduce using rule 44 (inicia)
+
+    asig    go to state 65
+    inicia  go to state 66
+
+
+state 48
+
+   35 lect: SCANF '(' . CDC ',' OPERADOR ID ')'
+
+    CDC  shift, and go to state 67
+
+
+state 49
+
+   50 while: WHILE '(' . expr ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 68
+    val        go to state 61
+
+
+state 50
+
+   23 instrucciones: instruccion instrucciones .
+
+    $default  reduce using rule 23 (instrucciones)
+
+
+state 51
+
+   24 instruccion: asig ';' .
+
+    $default  reduce using rule 24 (instruccion)
+
+
+state 52
+
+   25 instruccion: visu ';' .
+
+    $default  reduce using rule 25 (instruccion)
+
+
+state 53
+
+   26 instruccion: lect ';' .
+
+    $default  reduce using rule 26 (instruccion)
+
+
+state 54
+
+   39 else: ELSE . '{' instrucciones '}'
+   40     | ELSE . cond
+
+    IF   shift, and go to state 25
+    '{'  shift, and go to state 69
+
+    cond      go to state 70
+    bloqueIF  go to state 35
+
+
+state 55
+
+   37 cond: bloqueIF else .
+
+    $default  reduce using rule 37 (cond)
+
+
+state 56
+
+   10 declaracionVble: tipo id ';' .
+
+    $default  reduce using rule 10 (declaracionVble)
+
+
+state 57
+
+   11 declaracionVble: tipo id '=' . expr ';'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 71
+    val        go to state 61
+
+
+state 58
+
+   18 val: ID .
+
+    $default  reduce using rule 18 (val)
+
+
+state 59
+
+   19 val: valor_cte .
+
+    $default  reduce using rule 19 (val)
+
+
+state 60
+
+   29 asig: ID '=' expr .
+
+    $default  reduce using rule 29 (asig)
+
+
+state 61
+
+   16 expr: val .
+   17     | val . OPERADOR expr
+
+    OPERADOR  shift, and go to state 72
+
+    $default  reduce using rule 16 (expr)
+
+
+state 62
+
+   33 listExpr: expr .
+   34         | expr . ',' listExpr
+
+    ','  shift, and go to state 73
+
+    $default  reduce using rule 33 (listExpr)
+
+
+state 63
+
+   31 visu: PRINTF '(' listExpr . ')'
+
+    ')'  shift, and go to state 74
+
+
+state 64
+
+   38 bloqueIF: IF '(' expr . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 75
+
+
+state 65
+
+   45 inicia: asig .
+
+    $default  reduce using rule 45 (inicia)
+
+
+state 66
+
+   43 for: FOR '(' inicia . ';' expFOR ';' increm ')' '{' instrucciones '}'
+
+    ';'  shift, and go to state 76
+
+
+state 67
+
+   35 lect: SCANF '(' CDC . ',' OPERADOR ID ')'
+
+    ','  shift, and go to state 77
+
+
+state 68
+
+   50 while: WHILE '(' expr . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 78
+
+
+state 69
+
+   39 else: ELSE '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 79
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 70
+
+   40 else: ELSE cond .
+
+    $default  reduce using rule 40 (else)
+
+
+state 71
+
+   11 declaracionVble: tipo id '=' expr . ';'
+
+    ';'  shift, and go to state 80
+
+
+state 72
+
+   17 expr: val OPERADOR . expr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    valor_cte  go to state 59
+    expr       go to state 81
+    val        go to state 61
+
+
+state 73
+
+   34 listExpr: expr ',' . listExpr
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 32 (listExpr)
+
+    valor_cte  go to state 59
+    expr       go to state 62
+    val        go to state 61
+    listExpr   go to state 82
+
+
+state 74
+
+   31 visu: PRINTF '(' listExpr ')' .
+
+    $default  reduce using rule 31 (visu)
+
+
+state 75
+
+   38 bloqueIF: IF '(' expr ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 83
+
+
+state 76
+
+   43 for: FOR '(' inicia ';' . expFOR ';' increm ')' '{' instrucciones '}'
+
+    ID          shift, and go to state 58
+    NUM_ENTERO  shift, and go to state 12
+    NUM_REAL    shift, and go to state 13
+    CADENA      shift, and go to state 14
+
+    $default  reduce using rule 46 (expFOR)
+
+    valor_cte  go to state 59
+    expr       go to state 84
+    val        go to state 61
+    expFOR     go to state 85
+
+
+state 77
+
+   35 lect: SCANF '(' CDC ',' . OPERADOR ID ')'
+
+    OPERADOR  shift, and go to state 86
+
+
+state 78
+
+   50 while: WHILE '(' expr ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 87
+
+
+state 79
+
+   39 else: ELSE '{' instrucciones . '}'
+
+    '}'  shift, and go to state 88
+
+
+state 80
+
+   11 declaracionVble: tipo id '=' expr ';' .
+
+    $default  reduce using rule 11 (declaracionVble)
+
+
+state 81
+
+   17 expr: val OPERADOR expr .
+
+    $default  reduce using rule 17 (expr)
+
+
+state 82
+
+   34 listExpr: expr ',' listExpr .
+
+    $default  reduce using rule 34 (listExpr)
+
+
+state 83
+
+   38 bloqueIF: IF '(' expr ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 89
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 84
+
+   47 expFOR: expr .
+
+    $default  reduce using rule 47 (expFOR)
+
+
+state 85
+
+   43 for: FOR '(' inicia ';' expFOR . ';' increm ')' '{' instrucciones '}'
+
+    ';'  shift, and go to state 90
+
+
+state 86
+
+   35 lect: SCANF '(' CDC ',' OPERADOR . ID ')'
+
+    ID  shift, and go to state 91
+
+
+state 87
+
+   50 while: WHILE '(' expr ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 92
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 88
+
+   39 else: ELSE '{' instrucciones '}' .
+
+    $default  reduce using rule 39 (else)
+
+
+state 89
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 93
+
+
+state 90
+
+   43 for: FOR '(' inicia ';' expFOR ';' . increm ')' '{' instrucciones '}'
+
+    ID  shift, and go to state 94
+
+    $default  reduce using rule 48 (increm)
+
+    increm  go to state 95
+
+
+state 91
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID . ')'
+
+    ')'  shift, and go to state 96
+
+
+state 92
+
+   50 while: WHILE '(' expr ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 97
+
+
+state 93
+
+   38 bloqueIF: IF '(' expr ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 38 (bloqueIF)
+
+
+state 94
+
+   49 increm: ID . OPERADOR2
+
+    OPERADOR2  shift, and go to state 98
+
+
+state 95
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm . ')' '{' instrucciones '}'
+
+    ')'  shift, and go to state 99
+
+
+state 96
+
+   35 lect: SCANF '(' CDC ',' OPERADOR ID ')' .
+
+    $default  reduce using rule 35 (lect)
+
+
+state 97
+
+   50 while: WHILE '(' expr ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 50 (while)
+
+
+state 98
+
+   49 increm: ID OPERADOR2 .
+
+    $default  reduce using rule 49 (increm)
+
+
+state 99
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' . '{' instrucciones '}'
+
+    '{'  shift, and go to state 100
+
+
+state 100
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' . instrucciones '}'
+
+    ID      shift, and go to state 23
+    PRINTF  shift, and go to state 24
+    IF      shift, and go to state 25
+    FOR     shift, and go to state 26
+    SCANF   shift, and go to state 27
+    WHILE   shift, and go to state 28
+
+    $default  reduce using rule 22 (instrucciones)
+
+    instrucciones  go to state 101
+    instruccion    go to state 30
+    asig           go to state 31
+    visu           go to state 32
+    lect           go to state 33
+    cond           go to state 34
+    bloqueIF       go to state 35
+    repe           go to state 36
+    for            go to state 37
+    while          go to state 38
+
+
+state 101
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones . '}'
+
+    '}'  shift, and go to state 102
+
+
+state 102
+
+   43 for: FOR '(' inicia ';' expFOR ';' increm ')' '{' instrucciones '}' .
+
+    $default  reduce using rule 43 (for)
diff --git a/practica2/Practica2 David&Jose/y.tab.c b/practica2/Practica2 David&Jose/y.tab.c
index 6e7d3a1..062acea 100644
--- a/practica2/Practica2 David&Jose/y.tab.c	
+++ b/practica2/Practica2 David&Jose/y.tab.c	
@@ -119,13 +119,27 @@
 #include <stdio.h>
 
 void yyerror(const char* msg) {
-    fprintf(stderr, "%s\n", msg);
+		fprintf(stderr, "%s\n", msg);
 }
 int yylex(void);
 FILE *yyin;
 
+int num_sim = 0;
 extern int nLineas;
 
+struct simbolo{
+		char nombre[30];
+		int tipo;
+		int cte;
+		int inicializado;
+};
+struct simbolo tablaSimbolos[50];
+int dim = 0;
+
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[30],int dim);
+
+int errores = 0;
+
 
 
 /* Enabling traces.  */
@@ -147,7 +161,15 @@ extern int nLineas;
 #endif
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
+typedef union YYSTYPE
+#line 32 "practica2.y"
+{
+		 int tipo; // 1.int 2.float 3.char
+		 char nombreId[30];
+	}
+/* Line 193 of yacc.c.  */
+#line 172 "y.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -159,7 +181,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 163 "y.tab.c"
+#line 185 "y.tab.c"
 
 #ifdef short
 # undef short
@@ -374,16 +396,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  6
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   82
+#define YYLAST   100
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  29
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  29
+#define YYNNTS  28
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  53
+#define YYNRULES  51
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  105
+#define YYNSTATES  103
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -399,9 +421,9 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,    21,     2,     2,     2,     2,
-      27,    28,     2,     2,    23,     2,     2,     2,     2,     2,
+      26,    27,     2,     2,    28,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,    22,
-       2,    26,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    23,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -430,45 +452,44 @@ static const yytype_uint8 yytranslate[] =
    YYRHS.  */
 static const yytype_uint8 yyprhs[] =
 {
-       0,     0,     3,     7,     8,    11,    16,    18,    20,    22,
-      23,    26,    30,    32,    34,    36,    38,    42,    44,    46,
-      51,    54,    56,    59,    62,    65,    68,    70,    72,    76,
-      79,    81,    85,    87,    89,    94,    95,    97,   101,   109,
-     111,   114,   122,   127,   130,   132,   134,   146,   147,   149,
-     150,   152,   153,   156
+       0,     0,     3,     6,     7,    10,    15,    17,    19,    21,
+      22,    25,    29,    35,    37,    39,    41,    43,    45,    49,
+      51,    53,    58,    61,    62,    65,    68,    71,    74,    76,
+      78,    82,    85,    90,    91,    93,    97,   105,   107,   110,
+     118,   123,   126,   128,   130,   142,   143,   145,   146,   148,
+     149,   152
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      30,     0,    -1,    31,    34,    39,    -1,    -1,    32,    31,
-      -1,    21,     4,     3,    33,    -1,     5,    -1,     6,    -1,
-       7,    -1,    -1,    35,    34,    -1,    36,    37,    22,    -1,
-       8,    -1,     9,    -1,    10,    -1,    38,    -1,    38,    23,
-      37,    -1,     3,    -1,    43,    -1,    11,    24,    40,    25,
-      -1,    34,    41,    -1,    42,    -1,    42,    41,    -1,    43,
-      22,    -1,    46,    22,    -1,    48,    22,    -1,    49,    -1,
-      52,    -1,     3,    26,    44,    -1,     3,    13,    -1,    45,
-      -1,    45,    12,    44,    -1,     3,    -1,    33,    -1,    14,
-      27,    47,    28,    -1,    -1,    44,    -1,    44,    23,    47,
-      -1,    18,    27,    20,    23,    12,     3,    28,    -1,    50,
-      -1,    50,    51,    -1,    15,    27,    44,    28,    24,    41,
-      25,    -1,    17,    24,    41,    25,    -1,    17,    49,    -1,
-      53,    -1,    57,    -1,    16,    27,    54,    22,    55,    22,
-      56,    28,    24,    41,    25,    -1,    -1,    43,    -1,    -1,
-      44,    -1,    -1,     3,    13,    -1,    19,    27,    44,    28,
-      24,    41,    25,    -1
+      30,     0,    -1,    31,    40,    -1,    -1,    32,    31,    -1,
+      21,     4,     3,    33,    -1,     5,    -1,     6,    -1,     7,
+      -1,    -1,    35,    34,    -1,    36,    37,    22,    -1,    36,
+      37,    23,    38,    22,    -1,     8,    -1,     9,    -1,    10,
+      -1,     3,    -1,    39,    -1,    39,    12,    38,    -1,     3,
+      -1,    33,    -1,    11,    24,    41,    25,    -1,    34,    42,
+      -1,    -1,    43,    42,    -1,    44,    22,    -1,    45,    22,
+      -1,    47,    22,    -1,    48,    -1,    51,    -1,     3,    23,
+      38,    -1,     3,    13,    -1,    14,    26,    46,    27,    -1,
+      -1,    38,    -1,    38,    28,    46,    -1,    18,    26,    20,
+      28,    12,     3,    27,    -1,    49,    -1,    49,    50,    -1,
+      15,    26,    38,    27,    24,    42,    25,    -1,    17,    24,
+      42,    25,    -1,    17,    48,    -1,    52,    -1,    56,    -1,
+      16,    26,    53,    22,    54,    22,    55,    27,    24,    42,
+      25,    -1,    -1,    44,    -1,    -1,    38,    -1,    -1,     3,
+      13,    -1,    19,    26,    38,    27,    24,    42,    25,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    38,    38,    40,    41,    43,    45,    46,    47,    49,
-      50,    52,    54,    55,    56,    58,    59,    61,    62,    64,
-      66,    68,    69,    71,    72,    73,    74,    75,    77,    78,
-      80,    81,    83,    84,    86,    88,    89,    90,    92,    94,
-      95,    97,    99,   100,   102,   103,   105,   107,   108,   110,
-     111,   113,   114,   116
+       0,    59,    59,    67,    68,    70,    86,    87,    88,    90,
+      91,    93,   108,   129,   130,   131,   133,   135,   136,   144,
+     158,   160,   162,   164,   165,   167,   168,   169,   170,   171,
+     173,   189,   191,   193,   194,   195,   197,   209,   210,   212,
+     214,   215,   217,   218,   220,   222,   223,   225,   226,   228,
+     229,   241
 };
 #endif
 
@@ -480,12 +501,12 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "ID", "DEFINE", "NUM_ENTERO", "NUM_REAL",
   "CADENA", "INT", "FLOAT", "CHAR", "MAIN", "OPERADOR", "OPERADOR2",
   "PRINTF", "IF", "FOR", "ELSE", "SCANF", "WHILE", "CDC", "'#'", "';'",
-  "','", "'{'", "'}'", "'='", "'('", "')'", "$accept", "programa",
+  "'='", "'{'", "'}'", "'('", "')'", "','", "$accept", "programa",
   "declaracionesCtes", "declaracionCte", "valor_cte", "declaracionVbles",
-  "declaracionVble", "tipo", "listID", "id", "main", "cuerpo",
-  "instrucciones", "instruccion", "asig", "expr", "val", "visu",
-  "listExpr", "lect", "cond", "bloqueIF", "else", "repe", "for", "inicia",
-  "expFOR", "increm", "while", 0
+  "declaracionVble", "tipo", "id", "expr", "val", "main", "cuerpo",
+  "instrucciones", "instruccion", "asig", "visu", "listExpr", "lect",
+  "cond", "bloqueIF", "else", "repe", "for", "inicia", "expFOR", "increm",
+  "while", 0
 };
 #endif
 
@@ -496,7 +517,7 @@ static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,    35,    59,    44,   123,   125,    61,    40,    41
+     275,    35,    59,    61,   123,   125,    40,    41,    44
 };
 # endif
 
@@ -504,22 +525,22 @@ static const yytype_uint16 yytoknum[] =
 static const yytype_uint8 yyr1[] =
 {
        0,    29,    30,    31,    31,    32,    33,    33,    33,    34,
-      34,    35,    36,    36,    36,    37,    37,    38,    38,    39,
-      40,    41,    41,    42,    42,    42,    42,    42,    43,    43,
-      44,    44,    45,    45,    46,    47,    47,    47,    48,    49,
-      49,    50,    51,    51,    52,    52,    53,    54,    54,    55,
-      55,    56,    56,    57
+      34,    35,    35,    36,    36,    36,    37,    38,    38,    39,
+      39,    40,    41,    42,    42,    43,    43,    43,    43,    43,
+      44,    44,    45,    46,    46,    46,    47,    48,    48,    49,
+      50,    50,    51,    51,    52,    53,    53,    54,    54,    55,
+      55,    56
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     3,     0,     2,     4,     1,     1,     1,     0,
-       2,     3,     1,     1,     1,     1,     3,     1,     1,     4,
-       2,     1,     2,     2,     2,     2,     1,     1,     3,     2,
-       1,     3,     1,     1,     4,     0,     1,     3,     7,     1,
-       2,     7,     4,     2,     1,     1,    11,     0,     1,     0,
-       1,     0,     2,     7
+       0,     2,     2,     0,     2,     4,     1,     1,     1,     0,
+       2,     3,     5,     1,     1,     1,     1,     1,     3,     1,
+       1,     4,     2,     0,     2,     2,     2,     2,     1,     1,
+       3,     2,     4,     0,     1,     3,     7,     1,     2,     7,
+       4,     2,     1,     1,    11,     0,     1,     0,     1,     0,
+       2,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -527,51 +548,51 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       3,     0,     0,     9,     3,     0,     1,    12,    13,    14,
-       0,     9,     0,     4,     0,     0,     2,    10,    17,     0,
-      15,    18,     6,     7,     8,     5,     9,    29,     0,    11,
-       0,     0,     0,    32,    33,    28,    30,    16,     0,     0,
-       0,     0,     0,     0,    20,    21,     0,     0,     0,    26,
-      39,    27,    44,    45,    19,     0,    35,     0,    47,     0,
-       0,    22,    23,    24,    25,     0,    40,    31,    36,     0,
-       0,    48,     0,     0,     0,     0,    43,    35,    34,     0,
-      49,     0,     0,     0,    37,     0,    50,     0,     0,     0,
-      42,     0,    51,     0,     0,    41,     0,     0,    38,    53,
-      52,     0,     0,     0,    46
+       3,     0,     0,     0,     3,     0,     1,     0,     2,     4,
+       0,     9,     6,     7,     8,     5,    13,    14,    15,    23,
+       9,     0,     0,     0,     0,     0,     0,     0,     0,    22,
+      23,     0,     0,     0,    28,    37,    29,    42,    43,    10,
+      16,     0,    21,    31,     0,    33,     0,    45,     0,     0,
+      24,    25,    26,    27,     0,    38,    11,     0,    19,    20,
+      30,    17,    34,     0,     0,    46,     0,     0,     0,    23,
+      41,     0,     0,    33,    32,     0,    47,     0,     0,     0,
+      12,    18,    35,    23,    48,     0,     0,    23,    40,     0,
+      49,     0,     0,    39,     0,     0,    36,    51,    50,     0,
+      23,     0,    44
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     2,     3,     4,    34,    10,    11,    12,    19,    20,
-      16,    32,    44,    45,    46,    68,    36,    47,    69,    48,
-      49,    50,    66,    51,    52,    72,    87,    97,    53
+      -1,     2,     3,     4,    59,    19,    20,    21,    41,    62,
+      61,     8,    22,    29,    30,    31,    32,    63,    33,    34,
+      35,    55,    36,    37,    66,    85,    95,    38
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -46
+#define YYPACT_NINF -44
 static const yytype_int8 yypact[] =
 {
-     -17,     4,     6,    16,   -17,    24,   -46,   -46,   -46,   -46,
-      -2,    16,    25,   -46,    30,     9,   -46,   -46,    -3,    10,
-      15,   -46,   -46,   -46,   -46,   -46,    16,   -46,     8,   -46,
-      25,     2,    14,   -46,   -46,   -46,    29,   -46,    -3,    18,
-      19,    21,    22,    23,   -46,     2,    20,    31,    33,   -46,
-      26,   -46,   -46,   -46,   -46,     8,     8,     8,    48,    32,
-       8,   -46,   -46,   -46,   -46,   -12,   -46,   -46,    35,    28,
-      34,   -46,    37,    38,    36,     2,   -46,     8,   -46,    39,
-       8,    53,    42,    43,   -46,     2,   -46,    45,    57,     2,
-     -46,    44,    67,    46,    47,   -46,    58,    49,   -46,   -46,
-     -46,    51,     2,    54,   -46
+     -16,     6,    11,     2,   -16,    19,   -44,    10,   -44,   -44,
+      21,    22,   -44,   -44,   -44,   -44,   -44,   -44,   -44,     1,
+      22,    32,    12,   -11,    14,    15,    16,    17,    20,   -44,
+       1,    23,    25,    26,   -44,    27,   -44,   -44,   -44,   -44,
+     -44,   -15,   -44,   -44,    18,    18,    18,    33,    29,    18,
+     -44,   -44,   -44,   -44,    -6,   -44,   -44,    18,   -44,   -44,
+     -44,    38,    24,    28,    31,   -44,    34,    35,    37,     1,
+     -44,    39,    18,    18,   -44,    30,    18,    47,    36,    13,
+     -44,   -44,   -44,     1,   -44,    40,    48,     1,   -44,    41,
+      62,    42,    43,   -44,    54,    44,   -44,   -44,   -44,    49,
+       1,    50,   -44
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -46,   -46,    69,   -46,    62,    -4,   -46,   -46,    50,   -46,
-     -46,   -46,   -45,   -46,   -11,   -26,   -46,   -46,     1,   -46,
-      17,   -46,   -46,   -46,   -46,   -46,   -46,   -46,   -46
+     -44,   -44,    68,   -44,    64,    56,   -44,   -44,   -44,   -43,
+     -44,   -44,   -44,   -30,   -44,    45,   -44,     4,   -44,    46,
+     -44,   -44,   -44,   -44,   -44,   -44,   -44,   -44
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -581,45 +602,49 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      61,    21,    35,    40,     1,    38,     6,    17,     5,    15,
-      27,    33,    75,    22,    23,    24,    39,    40,    41,    21,
-      42,    43,    31,    28,     7,     8,     9,    14,    18,    67,
-      83,    70,    29,    26,    74,    22,    23,    24,    30,    54,
-      91,    55,    62,    65,    94,    56,    57,    71,    58,    59,
-      60,    38,    73,    63,    86,    64,    78,   103,    77,    80,
-      93,    81,    79,    85,    82,    88,    89,    92,    90,    95,
-      96,   100,    99,    13,    98,   102,    25,   101,    84,   104,
-      37,     0,    76
+      50,    60,    43,    64,    23,     1,    68,    56,    57,    25,
+       5,     6,    44,     7,    71,    24,    25,    26,    69,    27,
+      28,    58,    10,    12,    13,    14,    12,    13,    14,    81,
+      16,    17,    18,    84,    11,    40,    23,    42,    88,    79,
+      45,    46,    47,    48,    54,    51,    49,    52,    53,    67,
+      72,    91,    73,    89,    83,    74,    76,    92,    75,    86,
+      87,    80,    90,    77,    78,    94,    93,    98,    97,    96,
+     101,    99,     9,   100,    15,   102,    39,    82,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,     0,     0,     0,     0,     0,     0,     0,
+      70
 };
 
 static const yytype_int8 yycheck[] =
 {
-      45,    12,    28,    15,    21,     3,     0,    11,     4,    11,
-      13,     3,    24,     5,     6,     7,    14,    15,    16,    30,
-      18,    19,    26,    26,     8,     9,    10,     3,     3,    55,
-      75,    57,    22,    24,    60,     5,     6,     7,    23,    25,
-      85,    12,    22,    17,    89,    27,    27,    58,    27,    27,
-      27,     3,    20,    22,    80,    22,    28,   102,    23,    22,
-       3,    23,    28,    24,    28,    12,    24,    22,    25,    25,
-       3,    13,    25,     4,    28,    24,    14,    28,    77,    25,
-      30,    -1,    65
+      30,    44,    13,    46,     3,    21,    49,    22,    23,    15,
+       4,     0,    23,    11,    57,    14,    15,    16,    24,    18,
+      19,     3,     3,     5,     6,     7,     5,     6,     7,    72,
+       8,     9,    10,    76,    24,     3,     3,    25,    25,    69,
+      26,    26,    26,    26,    17,    22,    26,    22,    22,    20,
+      12,     3,    28,    83,    24,    27,    22,    87,    27,    12,
+      24,    22,    22,    28,    27,     3,    25,    13,    25,    27,
+     100,    27,     4,    24,    10,    25,    20,    73,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    47,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      54
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    21,    30,    31,    32,     4,     0,     8,     9,    10,
-      34,    35,    36,    31,     3,    11,    39,    34,     3,    37,
-      38,    43,     5,     6,     7,    33,    24,    13,    26,    22,
-      23,    34,    40,     3,    33,    44,    45,    37,     3,    14,
-      15,    16,    18,    19,    41,    42,    43,    46,    48,    49,
-      50,    52,    53,    57,    25,    12,    27,    27,    27,    27,
-      27,    41,    22,    22,    22,    17,    51,    44,    44,    47,
-      44,    43,    54,    20,    44,    24,    49,    23,    28,    28,
-      22,    23,    28,    41,    47,    24,    44,    55,    12,    24,
-      25,    41,    22,     3,    41,    25,     3,    56,    28,    25,
-      13,    28,    24,    41,    25
+       0,    21,    30,    31,    32,     4,     0,    11,    40,    31,
+       3,    24,     5,     6,     7,    33,     8,     9,    10,    34,
+      35,    36,    41,     3,    14,    15,    16,    18,    19,    42,
+      43,    44,    45,    47,    48,    49,    51,    52,    56,    34,
+       3,    37,    25,    13,    23,    26,    26,    26,    26,    26,
+      42,    22,    22,    22,    17,    50,    22,    23,     3,    33,
+      38,    39,    38,    46,    38,    44,    53,    20,    38,    24,
+      48,    38,    12,    28,    27,    27,    22,    28,    27,    42,
+      22,    38,    46,    24,    38,    54,    12,    24,    25,    42,
+      22,     3,    42,    25,     3,    55,    27,    25,    13,    27,
+      24,    42,    25
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1434,63 +1459,204 @@ yyparse ()
   switch (yyn)
     {
         case 2:
-#line 38 "practica2.y"
-    {printf("\n Todo correcto numero de lineas %d\n",nLineas);}
+#line 59 "practica2.y"
+    {if (errores > 0) {
+																		printf("\n Programa compilado con %d errores en %d lineas\n",errores,nLineas);
+																	}else{
+																		printf("\n Programa compilado sin errores y con %d lineas\n", nLineas);
+																	}	
+																 }
     break;
 
   case 5:
-#line 43 "practica2.y"
-    {printf("\nDeclaracion cte");}
+#line 70 "practica2.y"
+    { 
+																							int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(3) - (4)].nombreId), dim);
+																							if (pos != dim){
+																									printf("\n ERROR lin %d: Constante redeclarado",nLineas);
+																									errores++;
+																							}
+																							else {
+																									//lo añado
+																									tablaSimbolos[dim].tipo = (yyvsp[(4) - (4)].tipo);
+																									tablaSimbolos[dim].cte  = 1;
+																									tablaSimbolos[dim].inicializado = 1;
+																									strcpy(tablaSimbolos[dim].nombre,(yyvsp[(3) - (4)].nombreId));
+																									dim++;
+																							}
+																						}
+    break;
+
+  case 6:
+#line 86 "practica2.y"
+    { (yyval.tipo) = 1; }
+    break;
+
+  case 7:
+#line 87 "practica2.y"
+    { (yyval.tipo) = 2; }
+    break;
+
+  case 8:
+#line 88 "practica2.y"
+    { (yyval.tipo) = 3; }
     break;
 
   case 11:
-#line 52 "practica2.y"
-    {printf("\nDeclaracion vble");}
+#line 93 "practica2.y"
+    { 
+																	int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(2) - (3)].nombreId), dim);
+																	if (pos != dim){
+																			printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																			errores++;
+																	}
+																	else {
+																			//lo añado
+																			tablaSimbolos[dim].tipo = (yyvsp[(1) - (3)].tipo);
+																			tablaSimbolos[dim].cte  = 0;
+																			tablaSimbolos[dim].inicializado = 0;
+																			strcpy(tablaSimbolos[dim].nombre,(yyvsp[(2) - (3)].nombreId));
+																			dim++;
+																	}
+																}
     break;
 
-  case 23:
-#line 71 "practica2.y"
-    {printf("\nAsignacion");}
+  case 12:
+#line 108 "practica2.y"
+    {
+																						int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(2) - (5)].nombreId), dim);
+																						if (pos != dim){
+																								printf("\n ERROR lin %d: Identificador redeclarado",nLineas);
+																								errores++;
+																						}
+																						else {
+																							if ((yyvsp[(1) - (5)].tipo) != (yyvsp[(4) - (5)].tipo)){
+																								printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																								errores++;
+																							}else if ((yyvsp[(4) - (5)].tipo) != 4){ //el tipo 4 es indicador de que no existe la variable
+																							  //lo añado
+																								tablaSimbolos[dim].tipo = (yyvsp[(1) - (5)].tipo);
+																								tablaSimbolos[dim].cte  = 0;
+																								tablaSimbolos[dim].inicializado = 1;
+																								strcpy(tablaSimbolos[dim].nombre,(yyvsp[(2) - (5)].nombreId));
+																								dim++;
+																							}
+																						}
+																          }
+    break;
+
+  case 13:
+#line 129 "practica2.y"
+    { (yyval.tipo) = 1; }
     break;
 
-  case 24:
-#line 72 "practica2.y"
-    {printf("\nVisualizacion");}
+  case 14:
+#line 130 "practica2.y"
+    { (yyval.tipo) = 2; }
     break;
 
-  case 25:
-#line 73 "practica2.y"
-    {printf("\nLectura");}
+  case 15:
+#line 131 "practica2.y"
+    { (yyval.tipo) = 3; }
     break;
 
-  case 26:
-#line 74 "practica2.y"
-    {printf("\nCondicion");}
+  case 16:
+#line 133 "practica2.y"
+    { strcpy((yyval.nombreId), (yyvsp[(1) - (1)].nombreId)); }
     break;
 
-  case 39:
-#line 94 "practica2.y"
-    {printf("\nBloque IF");}
+  case 17:
+#line 135 "practica2.y"
+    { (yyval.tipo) = (yyvsp[(1) - (1)].tipo); }
     break;
 
-  case 40:
-#line 95 "practica2.y"
-    {printf("\nBloque IF+ELSE");}
+  case 18:
+#line 136 "practica2.y"
+    { 	if ((yyvsp[(1) - (3)].tipo) < (yyvsp[(3) - (3)].tipo))
+									 												{
+									 													(yyval.tipo) = (yyvsp[(3) - (3)].tipo);
+									 												}else{
+									 													(yyval.tipo) = (yyvsp[(1) - (3)].tipo);
+									 												}
+																			 }
     break;
 
-  case 44:
-#line 102 "practica2.y"
-    {printf("\nRepeticion: bloque FOR");}
+  case 19:
+#line 144 "practica2.y"
+    { int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(1) - (1)].nombreId), dim);
+																int tipo = tablaSimbolos[pos].tipo;
+																if (tipo == 0){
+																	printf("\n ERROR lin %d: Variable %s no declarada", nLineas, (yyvsp[(1) - (1)].nombreId));
+																	errores++;
+																	tipo = 4;
+																}
+																if (tablaSimbolos[pos].inicializado == 0){
+																	printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, (yyvsp[(1) - (1)].nombreId));
+																	errores++;
+																	tipo = 4;
+																}
+																(yyval.tipo) = tipo;
+															}
     break;
 
-  case 45:
-#line 103 "practica2.y"
-    {printf("\nRepeticion: bloque WHILE");}
+  case 20:
+#line 158 "practica2.y"
+    { (yyval.tipo) = (yyvsp[(1) - (1)].tipo); }
+    break;
+
+  case 30:
+#line 173 "practica2.y"
+    {  int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(1) - (3)].nombreId), dim);
+																	int tipo = tablaSimbolos[pos].tipo;
+																	if (tipo == 0){
+																		printf("\n ERROR lin %d: Variable %s no declarada", nLineas, (yyvsp[(1) - (3)].nombreId));
+																		errores++;
+																	}
+																	if (tablaSimbolos[pos].cte == 1){
+																		printf("\n ERROR lin %d: No se puede modificar el valor de una constante", nLineas);
+																		errores++;
+																	}
+																	if ((tipo == 1 && (yyvsp[(3) - (3)].tipo) == 2) || (tipo == 3 && (yyvsp[(3) - (3)].tipo) == 2)){ //Problemas con entero = float y char = float
+																		printf("\n ERROR lin %d: No coinciden los tipos", nLineas);
+																		errores++;
+																	}
+
+																}
+    break;
+
+  case 36:
+#line 197 "practica2.y"
+    { int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(6) - (7)].nombreId), dim);
+																												int tipo = tablaSimbolos[pos].tipo;
+																												if (tipo == 0){
+																													printf("\n ERROR lin %d: Variable %s no declarada", nLineas, (yyvsp[(6) - (7)].nombreId));
+																													errores++;
+																												}
+																												if ((yyvsp[(3) - (7)].tipo) != tipo && tipo != 0){
+																													printf("\n ERROR lin %d: Tipos incompatibles en scanf", nLineas);
+																													errores++;
+																												}																								
+																											}
+    break;
+
+  case 50:
+#line 229 "practica2.y"
+    { int pos = buscarSimbolo(tablaSimbolos, (yyvsp[(1) - (2)].nombreId), dim); 
+									 									int tipo = tablaSimbolos[pos].tipo;
+																		if (tipo == 0){
+																			printf("\n ERROR lin %d: Variable %s no declarada", nLineas, (yyvsp[(1) - (2)].nombreId));
+																			errores++;
+																		}
+																		else if (tablaSimbolos[pos].inicializado == 0){
+																			printf("\n ERROR lin %d: Variable %s no inicializada", nLineas, (yyvsp[(1) - (2)].nombreId));
+																			errores++;
+																		}
+									 								}
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 1494 "y.tab.c"
+#line 1660 "y.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1704,15 +1870,23 @@ yyparse ()
 }
 
 
-#line 120 "practica2.y"
+#line 245 "practica2.y"
 
 
 int main()
 {
-    yyin=fopen("practica2.c","r");
-    yyparse();
+		yyin=fopen("practica2conErrores.c","r");
+		yyparse();
  
 }
 
+int buscarSimbolo(struct simbolo tablaSimbolos[],char nombre[50],int dim){
+		for (int i=0;i<dim;i++){
+				if (strcmp(nombre,tablaSimbolos[i].nombre) == 0){
+						return i;
+				}
+		}
+		return dim;
+}
 
 
diff --git a/practica2/Practica2 David&Jose/y.tab.h b/practica2/Practica2 David&Jose/y.tab.h
index d178ede..7ac0668 100644
--- a/practica2/Practica2 David&Jose/y.tab.h	
+++ b/practica2/Practica2 David&Jose/y.tab.h	
@@ -83,7 +83,15 @@
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
+typedef union YYSTYPE
+#line 32 "practica2.y"
+{
+		 int tipo; // 1.int 2.float 3.char
+		 char nombreId[30];
+	}
+/* Line 1529 of yacc.c.  */
+#line 94 "y.tab.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1