From 871187305c7183e92d07784f8f390f11728779af Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Wed, 19 Apr 2017 17:09:57 +0200
Subject: [PATCH] typo

---
 .../digital/testing/parser/LineEmitter.java        |  4 ++--
 .../de/neemann/digital/testing/parser/Parser.java  | 14 ++++++--------
 .../digital/testing/parser/ValueAppenderBits.java  |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/de/neemann/digital/testing/parser/LineEmitter.java b/src/main/java/de/neemann/digital/testing/parser/LineEmitter.java
index 98f5b5b42..20669f295 100644
--- a/src/main/java/de/neemann/digital/testing/parser/LineEmitter.java
+++ b/src/main/java/de/neemann/digital/testing/parser/LineEmitter.java
@@ -10,9 +10,9 @@ public interface LineEmitter {
      * Is called to imit the described line to the listener
      *
      * @param listener the listener to emit the lines
-     * @param conext   the context
+     * @param context  the context
      * @throws ParserException ParserException
      */
-    void emitLines(LineListener listener, Context conext) throws ParserException;
+    void emitLines(LineListener listener, Context context) throws ParserException;
 
 }
diff --git a/src/main/java/de/neemann/digital/testing/parser/Parser.java b/src/main/java/de/neemann/digital/testing/parser/Parser.java
index 67256ca96..9e10414ad 100644
--- a/src/main/java/de/neemann/digital/testing/parser/Parser.java
+++ b/src/main/java/de/neemann/digital/testing/parser/Parser.java
@@ -43,7 +43,7 @@ public class Parser {
      */
     public Parser parse() throws IOException, ParserException {
         parseHeader();
-        emitter = parseRows(false);
+        emitter = parseRows(null);
         expect(Tokenizer.Token.EOF);
         return this;
     }
@@ -69,7 +69,7 @@ public class Parser {
         return new ParserException(Lang.get("err_unexpectedToken_N0_inLine_N1", name, tok.getLine()));
     }
 
-    private LineEmitter parseRows(boolean loop) throws IOException, ParserException {
+    private LineEmitter parseRows(Tokenizer.Token endToken) throws IOException, ParserException {
         LineEmitterList list = new LineEmitterList();
         while (true) {
             Tokenizer.Token t = tok.peek();
@@ -77,7 +77,7 @@ public class Parser {
                 case EOL:
                     break;
                 case EOF:
-                    if (loop)
+                    if (endToken != null)
                         throw newUnexpectedToken(t);
                     return list.minimize();
                 case BITS:
@@ -88,9 +88,7 @@ public class Parser {
                     break;
                 case END:
                     tok.consume();
-                    expect(Tokenizer.Token.LOOP);
-                    if (!loop)
-                        throw newUnexpectedToken(t);
+                    expect(endToken);
                     return list.minimize();
                 case REPEAT:
                     tok.consume();
@@ -111,7 +109,7 @@ public class Parser {
                     if (count > 1 << 16)
                         throw new ParserException(Lang.get("err_toManyTestEntries"));
                     expect(Tokenizer.Token.CLOSE);
-                    list.add(new LineEmitterRepeat(var, count, parseRows(true)));
+                    list.add(new LineEmitterRepeat(var, count, parseRows(Tokenizer.Token.LOOP)));
                     break;
                 default:
                     throw newUnexpectedToken(t);
@@ -128,7 +126,7 @@ public class Parser {
             switch (token) {
                 case NUMBER:
                     Value num = new Value(tok.getIdent());
-                    line.add((vals, conext) -> vals.add(num));
+                    line.add((vals, context) -> vals.add(num));
                     break;
                 case BITS:
                     expect(Tokenizer.Token.OPEN);
diff --git a/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java b/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java
index deaa7ed52..f055e208d 100644
--- a/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java
+++ b/src/main/java/de/neemann/digital/testing/parser/ValueAppenderBits.java
@@ -24,8 +24,8 @@ public class ValueAppenderBits implements ValueAppender {
     }
 
     @Override
-    public void appendValues(ArrayList<Value> values, Context conext) throws ParserException {
-        long value = expression.value(conext);
+    public void appendValues(ArrayList<Value> values, Context context) throws ParserException {
+        long value = expression.value(context);
         long mask = 1L << (bitCount - 1);
         for (int i = 0; i < bitCount; i++) {
             boolean v = (value & mask) != 0;