UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Poincare] Parse exponentiation

Browse Source
This commit is contained in:
Romain Goyet
2015-09-02 22:03:00 +02:00
parent af0313e22d
commit b84831bf76
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
poincare/src/expression_lexer.l
View File

@@ -50,6 +50,7 @@
[0-9]+ { yylval->string = yytext; return(INTEGER); }
\/ { return(DIVIDE); }
\^ { return(POW); }
%%

9
poincare/src/expression_parser.y
View File

@@ -56,8 +56,9 @@ void poincare_expression_yyerror(yyscan_t scanner, Expression ** expressionOutpu
/* The INTEGER token uses the "string" part of the union to store its value */
%token <string> INTEGER
/* The DIVIDE token uses no value */
/* The DIVIDE and POW tokens use no value */
%token DIVIDE
%token POW
/* The "exp" symbol uses the "expression" part of the union. */
%type <expression> exp;
@@ -88,8 +89,10 @@ Root:
*expressionOutput = $1;
}
exp: INTEGER { $$ = new Number($1); }
| exp DIVIDE exp { $$ = new Fraction($1,$3); }
exp:
INTEGER { $$ = new Number($1); }
| exp DIVIDE exp { $$ = new Fraction($1,$3); }
| exp POW exp { $$ = new Power($1,$3); }
;
/*