cadey
/
platypus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.xeserv.us:victorvalenca/platypus

This commit is contained in:
Victor Fernandes 2017-04-17 10:48:57 -04:00
parent bb898ea44e 3d646261b5
commit 5bd748b2e6
2 changed files with 220 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scanner.c
View File

@ -267,7 +267,7 @@ Token malar_next_token(Buffer * sc_buf)
b_retract_to_mark(sc_buf); b_retract_to_mark(sc_buf);
lex_buf = b_create(1, 1, 'a'); lex_buf = b_create(20, 8, 'a');
/* Copy the scanned lexeme into lexical buffer */ /* Copy the scanned lexeme into lexical buffer */
for (; lexstart < lexend; ++lexstart) { for (; lexstart < lexend; ++lexstart) {

62
stable.c
View File

@ -9,11 +9,11 @@
*/ */
#include "stable.h" #include "stable.h"
#define PLSBD_SZ 256 #define PLSBD_SZ 128
#define PLSBD_INC 8 #define PLSBD_INC 64
#define DEBUG #define DEBUG
/*#undef DEBUG*/ #undef DEBUG*/
/* Forward function declarations */ /* Forward function declarations */
static void st_setsize(void); static void st_setsize(void);
@ -65,15 +65,16 @@ STD st_create(int st_size){
* Algorithm: * Algorithm:
*/ */
int st_install(STD s_table, char *lexeme, char type, int line) { int st_install(STD s_table, char *lexeme, char type, int line) {
unsigned int offset, i, j, lex_len; int offset = -1, i, j, lex_len, lex_offset = 0, flag = 0;
short bd_offset, flag;
/* Cannot add new entry, table full */ /* Cannot add new entry, table full */
if (s_table.st_offset >= s_table.st_size) if (s_table.st_offset >= s_table.st_size)
return -1; return -1;
/* Look for an existing entry in the symbol table */ /* Look for an existing entry in the symbol table */
if (s_table.st_offset > 0)
offset = st_lookup(s_table, lexeme); offset = st_lookup(s_table, lexeme);
if (offset > -1) if (offset > -1)
return offset; return offset;
@ -82,24 +83,25 @@ int st_install(STD s_table, char *lexeme, char type, int line){
for (i = 0; i <= lex_len; ++i) { for (i = 0; i <= lex_len; ++i) {
if (!b_addc(s_table.plsBD, lexeme[i])) if (!b_addc(s_table.plsBD, lexeme[i]))
return -1; return -1;
if (b_rflag(s_table.plsBD) == SET_R_FLAG){ /* COPY NEW ADDRESSES TO PLEX ENTRIES */ if (b_rflag(s_table.plsBD) == SET_R_FLAG) { /* Trigger reassignment loop once lexeme is stored */
flag = 1; flag = 1;
} }
} }
/* If reallocation happened...*/
if (flag == 1) { if (flag == 1) {
bd_offset = 0; for (j = 0; j < s_table.st_offset; ++j) {
for (j = 0; j <= s_table.st_offset; ++j){ s_table.pstvr[j].plex = b_setmark(s_table.plsBD, (short) s_table.pstvr[j].i_value.str_offset);
s_table.pstvr[j].plex = b_setmark(s_table.plsBD, bd_offset + s_table.pstvr[j].i_value.str_offset);
if (j < s_table.st_offset)
bd_offset += s_table.pstvr[j+1].i_value.str_offset + 1; /*Add one because the offset doesn't include '\0' */
} }
} }
/* Set proper pointer values on symbol table */ /* Set proper pointer values on symbol table */
s_table.pstvr[s_table.st_offset].plex = b_setmark(s_table.plsBD, b_size(s_table.plsBD)); /* Get buffer offset location of the lexeme stored */
s_table.pstvr[s_table.st_offset].o_line = line; lex_offset = b_size(s_table.plsBD) - (strlen(lexeme) + 1);
s_table.pstvr[s_table.st_offset].plex = b_setmark(s_table.plsBD, (short) lex_offset);
s_table.pstvr[s_table.st_offset].o_line = line;
s_table.pstvr[s_table.st_offset].i_value.str_offset = lex_offset;
/* Set the default mask before setting the rest of the masks */ /* Set the default mask before setting the rest of the masks */
s_table.pstvr[s_table.st_offset].status_field = DFT_MASK; s_table.pstvr[s_table.st_offset].status_field = DFT_MASK;
@ -108,6 +110,7 @@ int st_install(STD s_table, char *lexeme, char type, int line){
case 'I': /* Integer type */ case 'I': /* Integer type */
s_table.pstvr[s_table.st_offset].status_field |= INT_MASK; s_table.pstvr[s_table.st_offset].status_field |= INT_MASK;
s_table.pstvr[s_table.st_offset].i_value.int_val = 0; s_table.pstvr[s_table.st_offset].i_value.int_val = 0;
break; break;
case 'F': /* Floating point type */ case 'F': /* Floating point type */
s_table.pstvr[s_table.st_offset].status_field |= FLT_MASK; s_table.pstvr[s_table.st_offset].status_field |= FLT_MASK;
@ -115,13 +118,13 @@ int st_install(STD s_table, char *lexeme, char type, int line){
break; break;
case 'S': /* String type */ case 'S': /* String type */
s_table.pstvr[s_table.st_offset].status_field |= STR_MASK; s_table.pstvr[s_table.st_offset].status_field |= STR_MASK;
s_table.pstvr[s_table.st_offset].i_value.str_offset = -1; s_table.pstvr[s_table.st_offset].i_value.int_val = -1;
s_table.pstvr[s_table.st_offset].i_value.fpl_val = -1.0f;
break; break;
default: default:
return -1; /* Not supposed to fall into here */ return -1; /* Not supposed to fall into here */
} }
/* Increment the symbol table offset */ /* Increment the symbol table offset */
st_incoffset(); st_incoffset();
return s_table.st_offset; return s_table.st_offset;
@ -141,13 +144,19 @@ int st_install(STD s_table, char *lexeme, char type, int line){
*/ */
int st_lookup(STD s_table, char *lexeme) { int st_lookup(STD s_table, char *lexeme) {
int i; /* idx: index location for symbol table, i: increment counter*/ int i; /* idx: index location for symbol table, i: increment counter*/
#ifdef DEBUG
for (i = s_table.st_offset; i >= 0; --i) { printf("Looking up %s...", lexeme);
if (strcmp(lexeme, s_table.pstvr[i].plex) == 0) #endif
for (i = s_table.st_offset - 1; i >= 0; --i) {
if (strcmp(lexeme, s_table.pstvr[i].plex) == 0) {
#ifdef DEBUG
printf("YES\n");
#endif
return i; return i;
} }
}
#ifdef DEBUG #ifdef DEBUG
printf("found nothing\n"); printf("NO\n");
#endif #endif
return -1; /* Found nothing */ return -1; /* Found nothing */
} }
@ -175,15 +184,12 @@ int st_change_type(STD s_table, int vid_offset, char v_type) {
/*sym_table.pstvr[vid_offset].status_field = sym_table.pstvr[vid_offset].status_field & DFT_U_MASK;*/ /*sym_table.pstvr[vid_offset].status_field = sym_table.pstvr[vid_offset].status_field & DFT_U_MASK;*/
s_table.pstvr[vid_offset].status_field &= DFT_U_MASK; s_table.pstvr[vid_offset].status_field &= DFT_U_MASK;
/*TODO: Ask if re-setting flags and "bailing out" is spec breaking, and
if flags should only be set if v_type is valid */
switch (v_type) { switch (v_type) {
case 'I': /* Integer type */ case 'I': /* Integer type */
s_table.pstvr[s_table.st_offset].status_field |= INT_MASK; s_table.pstvr[vid_offset].status_field |= INT_MASK;
break; break;
case 'F': /* Floating point type */ case 'F': /* Floating point type */
s_table.pstvr[s_table.st_offset].status_field |= FLT_MASK; s_table.pstvr[vid_offset].status_field |= FLT_MASK;
break; break;
case 'S': /* String type, do nothing as it cannot be changed */ case 'S': /* String type, do nothing as it cannot be changed */
break; break;
@ -280,7 +286,7 @@ int st_print(STD s_table){
if (s_table.st_size <= 0) return -1; if (s_table.st_size <= 0) return -1;
printf("Symbol Table\n____________\nLine Number\tVariable Identifier\n"); printf("Symbol Table\n____________\nLine Number\tVariable Identifier\n");
for(i = 0; i < s_table.st_offset; ++i) for (i = 0; i <= s_table.st_offset - 1 ; ++i)
printf("%2d\t\t%s\n", s_table.pstvr[i].o_line, s_table.pstvr[i].plex); printf("%2d\t\t%s\n", s_table.pstvr[i].o_line, s_table.pstvr[i].plex);
return i; return i;
@ -315,7 +321,7 @@ int st_store(STD s_table){
fprintf(out, "%d", s_table.st_size); fprintf(out, "%d", s_table.st_size);
for(i = 0; i < s_table.st_size; ++i){ for (i = 0; i < s_table.st_offset; ++i) {
fprintf(out, " %4X %d %s %d", fprintf(out, " %4X %d %s %d",
s_table.pstvr[i].status_field, /* Status flag */ s_table.pstvr[i].status_field, /* Status flag */
(int)strlen(s_table.pstvr[i].plex), /* Length of lexeme */ (int)strlen(s_table.pstvr[i].plex), /* Length of lexeme */
@ -369,8 +375,8 @@ static void st_incoffset(void){
* Algorithm: * Algorithm:
*/ */
int st_sort(STD s_table, char s_order) { int st_sort(STD s_table, char s_order) {
/* Compiler warning about unused parameter, /* Compiler warning about unused parameters,
* this is fine for this "future" implementation * this is fine for this dummy method
*/ */
return 0; /* SYKE! */ return 0; /* SYKE! */
} }