From c719f3e6c6663f6640422d81c156231c84cdcbdf Mon Sep 17 00:00:00 2001 From: ken Date: Sat, 7 Jan 2017 18:01:42 -0800 Subject: [PATCH] microfixes --- src/lexer_lex.rl | 69 ------------------------------------------------ src/parser.y | 2 +- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 src/lexer_lex.rl diff --git a/src/lexer_lex.rl b/src/lexer_lex.rl deleted file mode 100644 index be3cbff..0000000 --- a/src/lexer_lex.rl +++ /dev/null @@ -1,69 +0,0 @@ -/* Ragel State Machine for tokenizing text */ -#include -#include -#include "apc.h" -#include "parser.tab.h" - - -int ipow(int, int); -int ttov(const uint8_t* , int); -uint64_t ttor(const uint8_t* , int); -struct name* tton(const uint8_t* , int); - - -#define MAX_TOK_LEN 64 -#define MAX_TOKENS 16 -#define MAX_STR_SIZE (MAX_TOK_LEN * MAX_TOKENS) - -int ipow(int base, int exp) -{ - int result = 1; - while (exp) - { - if (exp & 1) - result = result * base; - exp = exp >> 1; - base *= base; - } - - return result; -} - -/* Token to Value */ -int ttov(const uint8_t* str, int len) -{ - int i, val = 0; - - for (i = 0; i < len; i++) - { - val += ((str[len - (i + 1)] - '0') * ipow(10,i)); - } - - return val; -} - -uint64_t ttor(const uint8_t* str, int len) -{ - int i; - uint64_t num = 0; - - for (i = 0; i < len; i++) - { - num += ((str[len - (i + 1)] - '0') * ipow(10,i)); - } - - return num; -} - -struct name* tton(const uint8_t* str, int len) -{ - int i; - struct name* namep; - - namep = (struct name*) malloc(MAX_NAME_LEN); - for(i = 0; i < MAX_NAME_LEN - 1; i++) - namep->name[i] = str[i]; - namep->name[i] = '\0'; - - return namep; -} diff --git a/src/parser.y b/src/parser.y index 3dd7364..9fe82df 100644 --- a/src/parser.y +++ b/src/parser.y @@ -27,7 +27,7 @@ static void yyerror(char const*); /* Stack-based class handler */ #define CLASS_POP(CS) (*--(CS-csp)) - #define CLASS_PUSH(CS,CL) (*(CS->csp)++ = CL + #define CLASS_PUSH(CS,CL) (*(CS->csp)++ = CL) #define yyclass(CS) (*(CS->csp)) #define yyclassld(CS) (ir_classld_from_class(yyclass(CS))) } -- 2.18.0