Fix more issues caused by negative literals

1 files changed, 16 insertions, 16 deletions

diff --git a/asm.c b/asm.c
index 5200ffc..91623ab 100644
--- a/asm.c
+++ b/asm.c
@@ -71,18 +71,6 @@ static const char *tok_reprs[] = {
 };
 
 static bool
-is_lit(const char *str)
-{
-	const char *c;
-
-	c = str;
-	if (*c == '-') c++;
-	else if (*c == '+') c++;
-	for (; *c && isdigit(*c); c++);
-	return !*c;
-}
-
-static bool
 is_int(const char *str)
 {
 	char *end;
@@ -95,8 +83,20 @@ is_int(const char *str)
 	return true;
 }
 
-static int
-str_to_lit(const char *str)
+bool
+asm_is_lit(const char *str)
+{
+	const char *c;
+
+	c = str;
+	if (*c == '-') c++;
+	else if (*c == '+') c++;
+	for (; *c && isdigit(*c); c++);
+	return !*c;
+}
+
+int
+asm_str_to_lit(const char *str)
 {
 	int m, v, b, i, o;
 
@@ -147,7 +147,7 @@ tok_to_op(struct asm_tokenizer *tokenizer, enum asm_tok tok)
 
 	op.type = tok_to_optype(tok);
 	if (op.type == OP_LIT) {
-		op.val.lit = str_to_lit(tokenizer->tokstr);
+		op.val.lit = asm_str_to_lit(tokenizer->tokstr);
 	} else if (op.type == OP_LABEL) {
 		op.val.label = strdup(tokenizer->tokstr);
 		if (!op.val.label) die("strdup:");
@@ -231,7 +231,7 @@ tok_next(struct asm_tokenizer *tok)
 			return (enum asm_tok) i;
 	}
 
-	if (is_lit(s)) {
+	if (asm_is_lit(s)) {
 		return TOK_LIT;
 	} else if (*s == '#') {
 		tok->off += strlen(tok->linebuf + tok->off);