サンプルに、三角形判定プログラムとそのテストを追加

[autotest_mk.git] / sample / hoc1 / hoc.y

diff --git a/sample/hoc1/hoc.y b/sample/hoc1/hoc.y
index 1762895..efabe25 100644 (file)
--- a/sample/hoc1/hoc.y
+++ b/sample/hoc1/hoc.y
@@ -2,16 +2,18 @@
 #define YYSTYPE double          /* data type of yacc stack */
 #include <stdio.h>
 #include <ctype.h>
+#include <math.h>
 %}
 
-%token  NUMBER
+%token  NUMBER EOL
 %left   '+' '-'                 /* left associative, same precedence */
 %left   '*' '/' '%'             /* left associative, higher precedence */
 %left   UNARYMINUS UNARYPLUS
+%right  '^'
 %%
 list:                           /* nothing */
-        | list '\n'
-        | list expr '\n'        { printf("\t%.8g\n", $2); }
+        | list EOL
+        | list expr EOL        { printdouble($2); }
 ;
 expr:   NUMBER          { $$ = $1; }
         | expr '+' expr { $$ = $1 + $3; }
@@ -19,6 +21,7 @@ expr:   NUMBER          { $$ = $1; }
         | expr '*' expr { $$ = $1 * $3; }
         | expr '/' expr { $$ = $1 / $3; }
         | expr '%' expr { $$ = (int)$1 % (int)$3; }
+        | expr '^' expr { $$ = pow($1, $3); }
         | '(' expr ')'{ $$ = $2; }
         | '-' expr %prec UNARYMINUS { $$ = -$2; }
         | '+' expr %prec UNARYPLUS { $$ = $2; }
@@ -33,6 +36,14 @@ int main(int argc, char *argv[]) {
     yyparse();
 }
 
+int printdouble(double f) {
+    if((f > 0 && f < 1e-15) || (f < 0 && f > -1e-15)) {
+        printf("\t%.20e\n", f);
+    } else {
+        printf("\t%.20f\n", f);
+    }
+}
+
 int yylex(){
     int c;
     while((c = getchar()) == ' ' || c == '\t') {
@@ -47,8 +58,11 @@ int yylex(){
         scanf("%lf", &yylval);
         return NUMBER;
     }
-    if(c == '\n') {
-        lineno++;
+    if(c == '\n' || c == ';') {
+        if(c == '\n') {
+            lineno++;
+        }
+        return EOL;
     }
     return c;
 }