qsdfhjk

Makefile

@@ -16,7 +16,7 @@ all: $(BIN)
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 y.tab.c: $(GRM)
-	bison --yacc -d $<
+	bison -d -t -v $<
 
 lex.yy.c: $(LEX)
 	flex $<

lex.l

@@ -1,5 +1,6 @@
 %{
-#include "y.tab.h"
+#include "table.h"
+#include "yacc.tab.h"
 %}
 
 

yacc.tab.h

@@ -0,0 +1,105 @@
+/* A Bison parser, made by GNU Bison 3.5.1.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
+#ifndef YY_YY_YACC_TAB_H_INCLUDED
+# define YY_YY_YACC_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    tWHILE = 258,
+    tIF = 259,
+    tELSE = 260,
+    tRETURN = 261,
+    tPRINT = 262,
+    tFLOAT = 263,
+    tINT = 264,
+    tVOID = 265,
+    tDIV = 266,
+    tMUL = 267,
+    tADD = 268,
+    tSUB = 269,
+    tASSIGN = 270,
+    tLT = 271,
+    tGT = 272,
+    tNE = 273,
+    tEQ = 274,
+    tGE = 275,
+    tLE = 276,
+    tAND = 277,
+    tOR = 278,
+    tNOT = 279,
+    tLBRACE = 280,
+    tRBRACE = 281,
+    tLPAR = 282,
+    tRPAR = 283,
+    tSEMI = 284,
+    tCOMMA = 285,
+    tID = 286,
+    tNB = 287
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+union YYSTYPE
+{
+#line 12 "yacc.y"
+int nbInt; /*enumVarType*/ int type; char* string;
+
+#line 93 "yacc.tab.h"
+
+};
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_YACC_TAB_H_INCLUDED  */

yacc.y

@@ -1,15 +1,12 @@
-%define parse.error detailed
-
 %{
 #include <stdio.h>
 #include <stdlib.h>
 #include "table.h"
-%}
 
-%code provides {
+int t;
   int yylex (void);
   void yyerror (const char *);
-}
+%}
 
 // TODO : PROBLEM DOES'NT COMPILE (enumVarType doesn't exist)
 %union {int nbInt; /*enumVarType*/ int type; char* string;}
@@ -39,9 +36,11 @@
 %type <type> Type
 
 
-%start Lines
+%start Program
 %%
 
+Program : FunctionDef ;
+
  /* Lines = Any line in the code that is not within an if/while statement*/
  Lines : Line
       | Line Lines;
@@ -49,8 +48,7 @@
 Line : IfStatement
     | WhileStatement 
     | Assignment
-    | FunctionDef
-    | Declaration
+    | Declarations
     | FunctionCall
     | Return 
     | Print;
@@ -77,7 +75,8 @@ ConditionalExpression : tID
 
 
 /*NbOrVariable is either a number or a variable of type int*/
-NbOrVariable : tID | tNB;
+NbOrVariable : tID {/* copy */}
+     | tNB {/* Affectation */};
  
  /*List of all numerical operators*/
 NumericalOperator : tLE | tGE | tEQ | tNE | tLT | tGT;
@@ -94,8 +93,8 @@ WhileStatement : tWHILE Condition InnerBlock;
 Assignment : tID tASSIGN Expression tSEMI {setInit($1);};
 
  /*Expression operation applied on variables or values*/
-Expression : NbOrVariable
-           | FunctionCall
+Expression : NbOrVariable 
+           | FunctionCall 
            | tLPAR Expression tRPAR
            /* replaced by the four following lines
            //| Expression Operation Expression
@@ -128,11 +127,24 @@ VarWithType : Type tID;
 Type : tINT {$$ = /*INT*/ 0;}
      | tFLOAT {$$ = /*FLOAT*/ 1;};
 
+
+Declarations : Type { t = $1; } Declaration Declarations1 tSEMI ;
+
+Declaration : tID {addElement($1, (enumVarType) t);} 
+            | tID tASSIGN Expression {addElement($1, (enumVarType) t);setInit($1);} ;
+
+Declarations1 : tCOMMA Declaration Declarations1 | {} ;
+
+
+
+
+
+
 Declaration : Type tID tSEMI {addElement($2, (enumVarType) $1);}
-            | Type tID tASSIGN Expression tSEMI {addElement($2, $1);setInit($2);}
+            | Type tID tASSIGN Expression tSEMI {addElement($2, (enumVarType) $1);setInit($2);}
 
 /* Potential improvement : take care of multiple definition on same line*/
-            | Type tID tCOMMA VarsCommaSeparated tSEMI {yyerror("[Beta] you cannot -still- define several variable on the same line");}
+            | Type tID tCOMMA VarsCommaSeparated tSEMI {yyerror("[Beta] you cannot -still- define several variable on the same line");} /* addElement($2, (enumVarType) $1); */
             | Type tID tCOMMA VarsCommaSeparated tASSIGN Expression tSEMI {yyerror("[Beta] you cannot -still- define several variable on the same line");};
             // yes this is perfectly valid in C, the last variable will hold the value, the others won't
 
@@ -140,7 +152,7 @@ Declaration : Type tID tSEMI {addElement($2, (enumVarType) $1);}
  // this is only used in case of a declaration of several same-typed
  // variables, ex : `int a,b,c;`
 VarsCommaSeparated : tID 
-                   | tID tCOMMA VarsCommaSeparated;
+                   | tID tCOMMA VarsCommaSeparated ;
 
 Return : tRETURN Expression tSEMI {decreaseDepth();};