Browse Source

Fix remaining acid build errors and build by default

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 5 years ago
parent
commit
5a88e0c116
4 changed files with 10 additions and 9 deletions
  1. 1 1
      sys/src/cmd/acid/lex.c
  2. 2 2
      sys/src/cmd/acid/main.c
  3. 5 5
      sys/src/cmd/acid/util.c
  4. 2 1
      sys/src/cmd/build.json

+ 1 - 1
sys/src/cmd/acid/lex.c

@@ -221,7 +221,7 @@ lexc(void)
 }
 
 int
-escchar(uint8_t c)
+escchar(int8_t c)
 {
 	int n;
 	char buf[Strsize];

+ 2 - 2
sys/src/cmd/acid/main.c

@@ -334,7 +334,7 @@ an(int op, Node *l, Node *r)
 	n = gmalloc(sizeof(Node));
 	memset(n, 0, sizeof(Node));
 	n->gc.gclink = gcl;
-	gcl = n;
+	gcl = &n->gc;
 	n->op = op;
 	n->left = l;
 	n->right = r;
@@ -350,7 +350,7 @@ al(int t)
 	memset(l, 0, sizeof(List));
 	l->type = t;
 	l->gc.gclink = gcl;
-	gcl = l;
+	gcl = &l->gc;
 	return l;
 }
 

+ 5 - 5
sys/src/cmd/acid/util.c

@@ -229,7 +229,7 @@ strnodlen(char *name, int len)
 	s->string[len] = '\0';
 
 	s->gc.gclink = gcl;
-	gcl = s;
+	gcl = &s->gc;
 
 	return s;
 }
@@ -259,7 +259,7 @@ runenode(Rune *name)
 	memmove(s->string, name, len);
 
 	s->gc.gclink = gcl;
-	gcl = s;
+	gcl = &s->gc;
 
 	return s;
 }
@@ -273,7 +273,7 @@ stradd(String *l, String *r)
 	len = l->len+r->len;
 	s = gmalloc(sizeof(String)+len+1);
 	s->gc.gclink = gcl;
-	gcl = s;
+	gcl = &s->gc;
 	s->len = len;
 	s->string = (char*)s+sizeof(String);
 	memmove(s->string, l->string, l->len);
@@ -290,8 +290,8 @@ straddrune(String *l, Rune r)
 
 	len = l->len+runelen(r);
 	s = gmalloc(sizeof(String)+len+1);
-	s->gclink = gcl;
-	gcl = s;
+	s->gc.gclink = gcl;
+	gcl = &s->gc;
 	s->len = len;
 	s->string = (char*)s+sizeof(String);
 	memmove(s->string, l->string, l->len);

+ 2 - 1
sys/src/cmd/build.json

@@ -18,6 +18,7 @@
 		"Install": "/$ARCH/bin/",
 		"Projects": [
 			"9660srv/9660srv.json",
+			"acid/acid.json",
 			"acpi/build.json",
 			"acpica/",
 			"acme/build.json",
@@ -80,4 +81,4 @@
 			"zenith/build.json"
 		]
 	}
-]
+]