projects
/
henge
/
apc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
361cff1
)
one more ragel warning to fix, fixed improper ir.c assignments
author
Jordan
<jordanlavatai@gmail.com>
Fri, 16 Dec 2016 20:57:13 +0000
(12:57 -0800)
committer
Jordan
<jordanlavatai@gmail.com>
Fri, 16 Dec 2016 20:57:13 +0000
(12:57 -0800)
src/ir.c
patch
|
blob
|
history
src/lexer_fsm.rl
patch
|
blob
|
history
diff --git
a/src/ir.c
b/src/ir.c
index
d9b1dc5
..
281b29a
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-51,7
+51,7
@@
curr_map(void);
struct set*
\r
curr_cdat_set(void);
\r
struct set*
\r
struct set*
\r
curr_cdat_set(void);
\r
struct set*
\r
-curr_set(
int
);
\r
+curr_set(
void
);
\r
struct ref*
\r
curr_ref(void);
\r
struct model*
\r
struct ref*
\r
curr_ref(void);
\r
struct model*
\r
@@
-290,6
+290,7
@@
struct odat {
struct framesheet {
\r
int width;
\r
int height;
\r
struct framesheet {
\r
int width;
\r
int height;
\r
+ uint8_t filepath[FPATH_MAX];
\r
int num_frames;
\r
\r
};
\r
int num_frames;
\r
\r
};
\r
@@
-299,8
+300,7
@@
struct framesheet {
/* NAMED spritesheet */
\r
struct model {
\r
struct name name;
\r
/* NAMED spritesheet */
\r
struct model {
\r
struct name name;
\r
- uint8_t filepath[PATH_MAX];
\r
- struct framesheet spritesheet[8]; //one for each
\r
+ struct framesheet spritesheet[8]; //one for each
\r
};
\r
\r
/* Vdat: Vdats are the video data of each object. They can not be
\r
};
\r
\r
/* Vdat: Vdats are the video data of each object. They can not be
\r
@@
-602,19
+602,9
@@
curr_cdat_set
\r
struct set*
\r
curr_set
\r
\r
struct set*
\r
curr_set
\r
-(int depth)
\r
-{ int i;
\r
- struct set* setp;
\r
-
\r
- for(i = 0; i <= depth; i++)
\r
- { if(!(setp = setp->set_list[setp->num_sets]))
\r
- { printf("You are trying to access a set that does not exist irmem.c\n");
\r
- return NULL;
\r
- }
\r
- }
\r
-
\r
-
\r
- return setp;
\r
+()
\r
+{
\r
+ return CURRENT_SET();
\r
}
\r
\r
struct ref*
\r
}
\r
\r
struct ref*
\r
diff --git
a/src/lexer_fsm.rl
b/src/lexer_fsm.rl
index
96d999a
..
efa6bf3
100644
(file)
--- a/
src/lexer_fsm.rl
+++ b/
src/lexer_fsm.rl
@@
-83,7
+83,7
@@
int lexer_setstr(uint8_t*, int);
action push_width { printf("Lexer_lexstring:: action:push_height p = %s\n", p);
PUSHTOK(WIDTH, ttov, val);
}
action push_width { printf("Lexer_lexstring:: action:push_height p = %s\n", p);
PUSHTOK(WIDTH, ttov, val);
}
- action push_link {yylval.str = (uint8_t*) '#'; lexer_pushtok(LINK
)
,yylval); }
+ action push_link {yylval.str = (uint8_t*) '#'; lexer_pushtok(LINK,yylval); }
#action lex_error { printf("input error: character %c in filename %s is invalid\n p = %s\n", fc, str, p);}
action p { printf("Lexer_lexstring:: p = %s\n", p);}
#action lex_error { printf("input error: character %c in filename %s is invalid\n p = %s\n", fc, str, p);}
action p { printf("Lexer_lexstring:: p = %s\n", p);}
@@
-112,9
+112,9
@@
int lexer_setstr(uint8_t*, int);
tok = (name | val | ref | dimensions | map | link | SS | direction);
tok = (name | val | ref | dimensions | map | link | SS | direction);
-
tok_lexer
:= (tok tok_delimiter)+ tok [\0];
+
main
:= (tok tok_delimiter)+ tok [\0];
- write data;
+ write data
nofinal noerror noprefix
;
}%%
}%%
@@
-177,7
+177,7
@@
lexer_lexstring
main := direction;
main := direction;
- write data;
+ write data
nofinal noprefix noerror
;
}%%
}%%