Fix conditional parsing; implement NIL comparison operators

CodeGen.pm

@@ -196,6 +196,14 @@ use 5.010;
         push @{ $self->buffer }, "    if ($top) { goto case $n; }\n";
     }
 
+    sub ncgoto {
+        my ($self, $n) = @_;
+        $n = ($self->labelname->{$n} //= $self->label) if $n < 0;
+        my $top = $self->_pop;
+        $self->_saveall;
+        push @{ $self->buffer }, "    if (!$top) { goto case $n; }\n";
+    }
+
     sub _cpscall {
         my ($self, $rt, $expr) = @_;
         $self->_saveall;
@@ -418,7 +426,7 @@ use 5.010;
         my ($self, $op) = @_;
         my $a2 = $self->_pop;
         my $a1 = $self->_pop;
-        $self->_push('Bool', "$a1 $op $a2");
+        $self->_push('Boolean', "$a1 $op $a2");
     }
 
     sub clr_field_get {

Niecza/Actions.pm

@@ -486,6 +486,10 @@ sub insn__S_arith { my ($cl, $M) = @_;
     $M->{_ast} = [[ clr_arith => $M->Str ]];
 }
 
+sub insn__S_compare { my ($cl, $M) = @_;
+    $M->{_ast} = [[ clr_compare => $M->Str ]];
+}
+
 sub insn__S_attr_get { my ($cl, $M) = @_;
     $M->{_ast} = [[ attr_get => $M->{varid}{_ast} ]];
 }
@@ -556,6 +560,11 @@ sub terminator__S_Thesis {}
 sub terminator__S_Semi {}
 sub terminator__S_Ket {}
 sub terminator__S_Ly {}
+sub terminator__S_then {}
+sub terminator__S_again {}
+sub terminator__S_repeat {}
+sub terminator__S_while {}
+sub terminator__S_else {}
 sub stdstopper {}
 sub unitstopper {}
 sub eat_terminator {}

Niecza/Grammar.pm6

@@ -30,11 +30,17 @@ grammar NIL is STD {
     rule nibbler {
         [
         || <insn>
-        || <?stopper>
+        || <?stdstopper>
         || <.panic: "Malformed NIL instruction">
         ]*
     }
 
+    token terminator:then   { <sym> }
+    token terminator:else   { <sym> }
+    token terminator:again  { <sym> }
+    token terminator:while  { <sym> }
+    token terminator:repeat { <sym> }
+
     token category:insn { <sym> }
     proto token insn { <...> }