WIP: .set command

diff --git a/src/test.c b/src/test.c
index 80c407aba0431ad8c9903f55f585bd5234e584ac..fbf6ecb89b19d51b3de6ad7d30b03c9a1a073151 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -235,6 +235,7 @@ void test_totok(void) {
   {                                                                            \
     int rc = 0;                                                                \
     const char *oexpr = expr;                                                  \
+    ulas.pass = ULAS_PASS_FINAL;                                               \
     int val = ulas_intexpr(&oexpr, strlen((expr)), &rc);                       \
     assert(rc == (expected_rc));                                               \
     assert(val == (expected_val));                                             \

diff --git a/src/ulas.c b/src/ulas.c
index dffac69bafaec363e9a327d20842a1029e5f56c5..094749b448da48fb3151890e288d2f027c5f4d4d 100644 (file)
--- a/src/ulas.c
+++ b/src/ulas.c
@@ -198,7 +198,7 @@ int ulas_isname(const char *tok, unsigned long n) {
     return 0;
   }
 
-  for (unsigned long i = 0; i < n; i++) {
+  for (unsigned long i = 0; i < n && tok[i]; i++) {
     char c = tok[i];
     if (c != '_' && !isalnum(c) &&
         !(i == 0 && c == ULAS_TOK_SCOPED_SYMBOL_BEGIN)) {
@@ -1043,6 +1043,10 @@ fail:
  */
 
 int ulas_valint(struct ulas_tok *lit, int *rc) {
+  if (ulas.pass != ULAS_PASS_FINAL) {
+    return 0;
+  }
+
   if (lit->type == ULAS_SYMBOL) {
     struct ulas_sym *stok = ulas_symbolresolve(lit->val.strv, ulas.scope, rc);
     if (!stok || *rc == -1) {
@@ -2030,6 +2034,66 @@ void ulas_asmout(FILE *dst, const char *outbuf, unsigned long n) {
   }
 }
 
+int ulas_asmdirbyte(FILE *dst, const char *line, unsigned long n) {
+  // .db expr, expr, expr
+  return 0;
+}
+
+int ulas_asmdirset(const char **line, unsigned long n) {
+  // .set <str,int> = name expr
+  char name[ULAS_SYMNAMEMAX];
+
+  ulas_tok(&ulas.tok, line, n);
+  enum ulas_type t = ULAS_INT;
+  if (strncmp(ulas.tok.buf, "int", ulas.tok.maxlen) == 0) {
+    t = ULAS_INT;
+  } else if (strncmp(ulas.tok.buf, "char", ulas.tok.maxlen) == 0) {
+    t = ULAS_STR;
+  } else {
+    ULASERR("Type (str,int) expected. Got '%s'\n", ulas.tok.buf);
+    return -1;
+  }
+
+  ulas_tok(&ulas.tok, line, n);
+  if (!ulas_isname(ulas.tok.buf, ulas.tok.maxlen)) {
+    ULASERR("Unexpected token '%s'\n", ulas.tok.buf);
+    return -1;
+  }
+  strncpy(name, ulas.tok.buf, ULAS_SYMNAMEMAX);
+
+  // consume =
+  ulas_tok(&ulas.tok, line, n);
+  if (strncmp(ulas.tok.buf, "=", ulas.tok.maxlen) != 0) {
+    ULASERR("Unexpected token '%s'. Expected '='\n", ulas.tok.buf);
+    return -1;
+  }
+
+  int rc = 0;
+
+  union ulas_val val = {0};
+  struct ulas_tok tok = {t, val};
+  switch (t) {
+  case ULAS_INT:
+    val.intv = ulas_intexpr(line, n, &rc);
+    if (rc == -1) {
+      goto fail;
+    }
+    break;
+  case ULAS_STR:
+    // TODO: implement str expressions
+  default:
+    ULASERR("Unexpected type\n");
+    return -1;
+  }
+
+  if (ulas.pass == ULAS_PASS_FINAL) {
+    // only really define in final pass
+    ulas_symbolset(name, -1, tok, 0);
+  }
+fail:
+  return rc;
+}
+
 int ulas_asmline(FILE *dst, FILE *src, const char *line, unsigned long n) {
   // this buffer is written both to dst and to verbose output
   char outbuf[ULAS_OUTBUFMAX];
@@ -2078,8 +2142,7 @@ int ulas_asmline(FILE *dst, FILE *src, const char *line, unsigned long n) {
       break;
     case ULAS_ASMDIR_SET:
       // only do this in the final pass
-      if (ulas.pass == ULAS_PASS_FINAL) {
-      }
+      rc = ulas_asmdirset(&line, n);
       break;
     case ULAS_ASMDIR_BYTE:
     case ULAS_ASMDIR_STR:

diff --git a/tests/t0.s b/tests/t0.s
index fe99822dea25e537eb9dea4acb81f83650cce8fa..5de1ad5a669b7ced129956804ed212ff274d3c68 100644 (file)
--- a/tests/t0.s
+++ b/tests/t0.s
@@ -80,3 +80,6 @@ l2:
 @local: ld bc, @local
   ld bc, $
   jr z, $ - l2
+
+.set int s1 = 1 + 2
+  ld a, s1