done

assignment2/matfunc.yy.lex → assign2/matfunc.lex

@@ -18,19 +18,19 @@ digits [0-9]
 number [\-]?(0|([1-9]+{digits}*))
  /************* Start: add your definitions here*/
 
-
  /************* End: add your definitions here */
 %%
 \n return *yytext;
  /* Start: add your rules here*/
+
+REV yylval = "REV";printf("%s",yytext);return REV;
+NEG yylval = "NEG";printf("%s",yytext);return NEG;
+{number} yylval = (char*)malloc(sizeof(char)*MAXL);strcpy(yylval, yytext);printf("%s",yytext);return NUM;
 
-REV yyval = "REV";return REV;
-NEG yyval = "NEG";return NEG;
-{number} yylval = (char*)malloc(sizeof(char)*MAXL);strcpy(yylval, yytext);return NUM;
-. printf("%c",*yytext); 
-
- /* End: add your rules here*/
+[+\-*\/,\[\]\n()] printf("%s",yytext);return *yytext;
 {ws}
+. printf("missed: '%s'", yytext);
+ /* End: add your rules here*/
 %%
 
 void RmWs(char* str){

assignment2/matfunc.y → assign2/matfunc.y

@@ -50,7 +50,7 @@ line: 	'\n'
 
 expr: s1            {$$=$1;}
     ;
-s1: s1 '+' s2       {$$=Add($1,$3);printf("plus:%s + %s",$1,$3);}
+s1: s1 '+' s2       {$$=Add($1,$3);}
     | s1 '-' s2     {$$=Minus($1,$3);}
     | s2            {$$=$1;}
     ;
@@ -68,7 +68,7 @@ s4: MATRIX          {$$=$1}
 MATRIX: '[' COLS ']'{$$=malloc(sizeof(char*)*MAXL);sprintf($$,"[%s]",$2);}
     ;
 COLS: ROW           {$$=$1;}
-    | ROW ','       {$$=malloc(sizeof(char*)*(strlen($1)+1));sprintf($$,"%s,",$1);}
+    | ROW ',' COLS      {$$=malloc(sizeof(char*)*(strlen($1)+1));sprintf($$,"%s,%s",$1,$3);}
 ROW: '[' VEC ']'    {$$=malloc(sizeof(char*)*MAXL);sprintf($$,"[%s]",$2);}
     ;
 VEC: NUM ',' VEC    {$$=malloc(sizeof(char*)*MAXL);sprintf($$,"%s,%s",$1,$3);}
@@ -102,10 +102,10 @@ int main(int argc, char *argv[]){
 
 int yyerror(const char* s)
 {
-//    extern int yylineno;
-//    extern char *yytext;
-//    printf("\n^%d: %s at %s #%d\n", yylineno, s, yytext, (int)(*yytext));
-//    return 0;
+    /*extern int yylineno;
+    extern char *yytext;
+    printf("\n^%d: %s at %s #%d\n", yylineno, s, yytext, (int)(*yytext));
+    return 0;*/
 }
 
 char *FFormat(const char* str){

assign2/results.txt

@@ -0,0 +1,13 @@
+[[2]]
+[[2]]
+[[2,4]]
+[[2,4],[12,14],[10,10]]
+[[5,205,19],[-223,13,25]]
+[[6,271,22],[201,25,45]]
+[[6,5,4],[3,2,1]]
+[[3,6],[9,12]]
+[[2,4],[6,8]]
+[[2,4,6],[4,6,8]]
+[[5,207,19],[1931,13,43]]
+[[0,0,0],[0,0,0]]
+[[-2,-4,-6],[-2,-4,-6]]

assignment2/run.sh → assign2/run.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
+#cd ../../mnt/c/Users/dipsy/Desktop/course/COMP3031/assign2
+
 bison -d matfunc.y
-#flex -o matfunc.lex.yy.c matfunc.lex
 flex matfunc.lex
 gcc *.c -o test -lm
 ./test testcase.txt

assignment2/test.sh → assign2/test.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 bison -d matfunc.y
-#flex -o matfunc.lex.yy.c matfunc.lex
 flex matfunc.lex
 gcc *.c -o test -lm
 ./test