Merge branch 'DeathStroke19891-main'

Fixed shift reduce conflicts in Program 3a

Author: KTS-o7

Prog3/a/lex.l

@@ -3,8 +3,10 @@
 %}
 %%
 "for" return FOR;
+"int"|"float"|"double"|"bool" return TYPE;
+">"|"<"|">="|"<="|"=="|"!=" return OP;
 [a-zA-Z]* return IDEN;
 [0-9]+ return NUM;
-[\n ]  ;
+[\n\t ]  ;
 .   return yytext[0];
-%%
+%%

Prog3/a/yacc.y

@@ -5,29 +5,50 @@
 	int yyerror();
 	int cnt=0;
 %}
-%token FOR IDEN NUM
+%token FOR IDEN NUM TYPE OP
+%left '+' '-'
+%left '*' '/'
 %%
-S:I
-;
-I:FOR A B	{cnt++;}
-;
-A:'('E';'E';'E')'
-;
-E:IDEN Z IDEN
-|IDEN Z NUM
-|IDEN U
-|IDEN
-;
-Z:'='|'>'|'<'|'<''='|'>''='|'=''+'|'=''-'
-;
-U:'+''+'|'-''-' 
-;
-B:B B
-|'{' B '}'
-|I
-|E';'
-|
-;
+
+// Tokens
+
+// FOR -> for
+// IDEN -> identifier
+// NUM -> number
+// TYPE -> datatype
+// OP -> relational operator
+
+// Non-terminals
+
+// S -> Start symbol
+// BODY -> Body  of For loop
+// COND -> Condition
+// S1 -> Single Statement
+// SS -> Set of statements
+// T -> Term
+// E -> Expression
+// F -> For loop block
+// DA -> Declaration or assignment
+// DECL -> Declaration
+// ASSGN -> Assignment
+
+S:F;
+F:FOR'('DA';'COND';'S1')'BODY { cnt++; } |
+  FOR'(' ';'COND';'S1')'BODY { cnt++; } |
+  FOR'('DA';' ';'S1')'BODY { cnt++; } |
+  FOR'(' ';' ';'S1')'BODY { cnt++; } ;
+
+DA:DECL|ASSGN
+DECL: TYPE IDEN | TYPE ASSGN;
+ASSGN : IDEN '=' E;
+COND : T OP T;
+T : NUM | IDEN ;
+
+BODY: S1';' | '{'SS'}' | F |';';
+
+SS: S1 ';' SS | F SS |;
+S1: ASSGN | E | DECL ;
+E : E '+' E | E '-' E | E '*' E | E '/' E | '-''-'E | '+''+'E | E'+''+' | E'-''-' | T ;
 %%
 int main()
 {
@@ -40,4 +61,4 @@ int yyerror()
 {
 	printf("Invalid\n");
 	exit(0);
-}
+}

Prog3/b/lex.l

@@ -7,11 +7,9 @@
 
 "int"|"float"|"char"|"void" {return TYPE;}
 
-"return" {return RET;}
-
 [a-zA-Z][a-zA-Z0-9_]* {return IDEN;}
 
 [0-9]+ {return NUM;}
 
 . {return yytext[0];}
-%%
+%%

Prog3/b/yacc.y

@@ -5,31 +5,42 @@
     int yylex();
 %}
 
-%token TYPE IDEN NUM RET
- 
+%token TYPE IDEN NUM
+%left '+' '-'
+%left '*' '/'
+
 %%
-S: FUN  {printf("Accepted\n");exit(0);}
-;
-FUN: TYPE IDEN '(' PARAM ')' '{' BODY '}'
-;
-PARAM: PARAM ',' PARAM
-|TYPE IDEN
-|
-;
-BODY: BODY BODY
-| PARAM ';'
-| E ';'
-| RET E ';'
-|
-;
-E: IDEN '=' E
-| E '+' E
-| E '-' E
-| E '*' E
-| E '/' E
-| IDEN
-| NUM
-;
+// Tokens
+
+// IDEN -> identifier
+// NUM -> number
+// TYPE -> datatype
+
+// Non-terminals
+
+// S -> Start symbol
+// FUN -> function block
+// PARAMS -> parameters
+// PARAM -> parameter
+// BODY -> Function body
+// S1 -> Single Statement
+// SS -> Set of statements
+// T -> Term
+// E -> Expression
+// DECL -> Declaration
+// ASSGN -> Assignment
+
+S: FUN  { printf("Accepted\n"); exit(0); } ;
+FUN: TYPE IDEN '(' PARAMS ')' BODY ;
+BODY: S1';' | '{'SS'}'
+PARAMS: PARAM','PARAMS | PARAM | ;
+PARAM:  TYPE IDEN;
+SS: S1';'SS | ;
+S1: ASSGN | E | DECL ;
+DECL: TYPE IDEN | TYPE ASSGN ;
+ASSGN : IDEN '=' E ;
+E : E '+' E | E '-' E | E '*' E | E '/' E | '-''-'E | '+''+'E | E'+''+' | E'-''-' | T ;
+T : NUM | IDEN ;
 %%
 int main()
 {
@@ -42,4 +53,4 @@ int yyerror()
 {
     printf("ERROR\n");
     exit(0);
-}
+}

README.md

@@ -63,7 +63,7 @@ Input format for each of the programs
     ```
     > b. Validate function defination
     ```bash
-    int main(){}
+    int main(){};
     int foo(int a){}
     int bar(int a,int b){return a;}
     ```

docs/README.md

@@ -63,7 +63,7 @@ Input format for each of the programs
     ```
     > b. Validate function defination
     ```bash
-    int main(){}
+    int main(){};
     int foo(int a){}
     int bar(int a,int b){return a;}
     ```
@@ -80,3 +80,23 @@ Input format for each of the programs
     ```bash
     ./outputfilename.out < input.txt
     ```
+
+---
+
+# Change Log
+
+## Version 1
+
+- Added all 5 programs
+- Had some conflicts in Shift/Reduce and Reduce/ Reduce
+
+## Version 2
+
+- @DeathStroke1991(https://github.com/DeathStroke19891) Fixed the issues in 3a and 3b
+- Added comments on grammer.
+
+---
+
+# Contribution
+
+This repo is open for contributions. Please open an Issue or open a PR with appropriate edits.