summaryrefslogtreecommitdiffstats
path: root/dimension
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-10-27 17:33:44 -0400
committerTavian Barnes <tavianator@gmail.com>2009-10-27 19:35:16 -0400
commit50d844e91589a8f51cade42b732bcd1de889987b (patch)
treede7fd28f212412d397c93e3aee18ebbf1f121d9d /dimension
parent9d093988213e7471a5d8ba6042e16c8d2ab5f053 (diff)
downloaddimension-50d844e91589a8f51cade42b732bcd1de889987b.tar.xz
Support more symbols in tokenizer.
Diffstat (limited to 'dimension')
-rw-r--r--dimension/tokenize.c64
-rw-r--r--dimension/tokenize.h15
2 files changed, 59 insertions, 20 deletions
diff --git a/dimension/tokenize.c b/dimension/tokenize.c
index e1c2fce..7019ad7 100644
--- a/dimension/tokenize.c
+++ b/dimension/tokenize.c
@@ -51,6 +51,9 @@ dmnsn_tokenize(FILE *file)
dmnsn_array *tokens = dmnsn_new_array(sizeof(dmnsn_token));
while (next - map < size) {
+ /* Saves us some code repetition in the vast majority of cases */
+ token.value = NULL;
+
switch (*next) {
case ' ':
case '\n':
@@ -59,19 +62,29 @@ dmnsn_tokenize(FILE *file)
case '\f':
case '\v':
/* Skip whitespace */
- break;
-
- case '{':
- token.type = DMNSN_LBRACE;
- token.value = NULL;
- dmnsn_array_push(tokens, &token);
- break;
-
- case '}':
- token.type = DMNSN_RBRACE;
- token.value = NULL;
- dmnsn_array_push(tokens, &token);
- break;
+ ++next;
+ continue;
+
+ /* Macro to make basic symbol tokens easier */
+ #define dmnsn_simple_token(c, tp) \
+ case c: \
+ token.type = tp; \
+ break
+
+ /* Some simple punctuation marks */
+ dmnsn_simple_token('{', DMNSN_LBRACE);
+ dmnsn_simple_token('}', DMNSN_RBRACE);
+ dmnsn_simple_token('(', DMNSN_LPAREN);
+ dmnsn_simple_token(')', DMNSN_RPAREN);
+ dmnsn_simple_token('[', DMNSN_LBRACKET);
+ dmnsn_simple_token(']', DMNSN_RBRACKET);
+ dmnsn_simple_token('<', DMNSN_LT);
+ dmnsn_simple_token('>', DMNSN_GT);
+ dmnsn_simple_token('+', DMNSN_PLUS);
+ dmnsn_simple_token('-', DMNSN_MINUS);
+ dmnsn_simple_token('*', DMNSN_STAR);
+ dmnsn_simple_token('/', DMNSN_SLASH);
+ dmnsn_simple_token(',', DMNSN_COMMA);
default:
/* Unrecognised character */
@@ -82,6 +95,7 @@ dmnsn_tokenize(FILE *file)
return NULL;
}
+ dmnsn_array_push(tokens, &token);
++next;
}
@@ -138,13 +152,27 @@ static const char *
dmnsn_token_name(dmnsn_token_type token_type)
{
switch (token_type) {
- case DMNSN_LBRACE:
- return "{";
-
- case DMNSN_RBRACE:
- return "}";
+ /* Macro to shorten this huge switch */
+ #define dmnsn_token_map(type, str) \
+ case type: \
+ return str;
+
+ dmnsn_token_map(DMNSN_LBRACE, "{");
+ dmnsn_token_map(DMNSN_RBRACE, "}")
+ dmnsn_token_map(DMNSN_LPAREN, "\\(");
+ dmnsn_token_map(DMNSN_RPAREN, "\\)");
+ dmnsn_token_map(DMNSN_LBRACKET, "[");
+ dmnsn_token_map(DMNSN_RBRACKET, "]");
+ dmnsn_token_map(DMNSN_LT, "<");
+ dmnsn_token_map(DMNSN_GT, ">");
+ dmnsn_token_map(DMNSN_PLUS, "+");
+ dmnsn_token_map(DMNSN_MINUS, "-");
+ dmnsn_token_map(DMNSN_STAR, "*");
+ dmnsn_token_map(DMNSN_SLASH, "/");
+ dmnsn_token_map(DMNSN_COMMA, ",");
default:
+ printf("Warning: unrecognised token %d.\n", (int)token_type);
return "unrecognized-token";
}
}
diff --git a/dimension/tokenize.h b/dimension/tokenize.h
index 3798d1e..e64b7eb 100644
--- a/dimension/tokenize.h
+++ b/dimension/tokenize.h
@@ -20,8 +20,19 @@
#include "../libdimension/dimension.h"
typedef enum {
- DMNSN_LBRACE,
- DMNSN_RBRACE
+ DMNSN_LBRACE, /* { */
+ DMNSN_RBRACE, /* } */
+ DMNSN_LPAREN, /* ( */
+ DMNSN_RPAREN, /* ) */
+ DMNSN_LBRACKET, /* [ */
+ DMNSN_RBRACKET, /* ] */
+ DMNSN_LT, /* < */
+ DMNSN_GT, /* > */
+ DMNSN_PLUS, /* + */
+ DMNSN_MINUS, /* - */
+ DMNSN_STAR, /* * */
+ DMNSN_SLASH, /* / */
+ DMNSN_COMMA, /* , */
} dmnsn_token_type;
typedef struct dmnsn_token dmnsn_token;