ref: 7be6028358f07d4e01fbadf8d9f31041bf8c2fce
parent: f7ff6155f5c57b8ece62dd8f1401c69e3bf3c6a4
author: Quentin Carbonneaux <quentin@c9x.me>
date: Wed Jul 26 07:15:37 EDT 2017
Whitespace fixes.
--- a/parse/gram.y
+++ b/parse/gram.y
@@ -333,7 +333,7 @@
| pkgtydef {
/* the type may only be null in a package context, so we
can set the type when merging in this case.
-
+
FIXME: clean up the fucking special cases. */
if ($1.type)
$1.type->vis = Visexport;
@@ -422,7 +422,7 @@
0);
for (i = 0; i < $6.nn; i++) {
$6.nl[i]->decl.trait = $$;
- $6.nl[i]->decl.impls = mkht(tyhash, tyeq);
+ $6.nl[i]->decl.impls = mkht(tyhash, tyeq);
$6.nl[i]->decl.isgeneric = 1;
}
}
@@ -735,7 +735,7 @@
| atomicexpr
;
-arglist : expr
+arglist : expr
{$$.nl = NULL; $$.nn = 0; lappend(&$$.nl, &$$.nn, $1);}
| arglist Tcomma expr
{lappend(&$$.nl, &$$.nn, $3);}
@@ -805,7 +805,7 @@
strlit : Tstrlit { $$ = mkstr($1->loc, $1->strval); }
| strlit Tstrlit {
Str merged;
-
+
merged.len = $1->lit.strval.len + $2->strval.len;
merged.buf = malloc(merged.len);
memcpy(merged.buf, $1->lit.strval.buf, $1->lit.strval.len);
@@ -1173,4 +1173,3 @@
}
return o;
}
-
--- a/parse/infer.c
+++ b/parse/infer.c
@@ -886,10 +886,10 @@
Type *t;
t = htget(seqbase, a);
- while (!t && a->type == Tyname) {
- a = a->sub[0];
- t = htget(seqbase, a);
- }
+ while (!t && a->type == Tyname) {
+ a = a->sub[0];
+ t = htget(seqbase, a);
+ }
if (!t && (a->type == Tyslice || a->type == Tyarray || a->type == Typtr))
t = a->sub[0];
if (t)
@@ -2421,8 +2421,8 @@
}
for (i = 0; i < n->expr.nargs; i++)
typesub(n->expr.args[i], noerr);
- if (!noerr)
- verifyop(n);
+ if (!noerr)
+ verifyop(n);
break;
case Nfunc:
pushstab(n->func.scope);