Tests fixed; nval assignment fixed

Author: Holado

src/tokenizer/tokenizer.py

@@ -1692,13 +1692,13 @@ def parse_phrases_1(token_stream):
             # Coalesce [year|number] + ['e.Kr.'|'f.Kr.'] into year
             if token.kind == TOK.YEAR or token.kind == TOK.NUMBER:
                 val = token.val if token.kind == TOK.YEAR else token.val[0]
-                nval = ""
+                nval = None
                 if next_token.txt in BCE:  # f.Kr.
                     # Yes, we set year X BCE as year -X ;-)
                     nval = -val
                 elif next_token.txt in CE:  # e.Kr.
                     nval = val
-                if nval:
+                if nval is not None:
                     token = TOK.Year(token.txt + " " + next_token.txt, nval)
                     next_token = next(token_stream)
                     if next_token.txt == ".":

test/test_tokenizer.py

@@ -735,7 +735,7 @@ def test_sentence(text, expected, **options):
 
     test_sentence(
         "1.030 hPa lægð gengur yfir landið árið 2019 e.Kr. Jógúrtin inniheldur 80 kcal.",
-        "B ME      W    W      W    W      Y              E B W    W          ME     P E",
+        "B ME      W    W      W    W      Y              E B W     W          ME     P E",
     )
 
     test_sentence(
@@ -849,7 +849,12 @@ def test_sentence(text, expected, **options):
     )
 
     test_sentence(
-        "Tösku-og hanskabúðin, sálug, var á Lauga- eða Skothúsvegi.",
+        "Tösku- og hanskabúðin, sálug, var á Lauga- eða Skothúsvegi.",
+        "B W                 P W    P W   W W                    P E",
+    )
+
+    test_sentence(
+        "Tösku-og hanskabúðin, sálug, var á Lauga-eða Skothúsvegi.",
         "B W                 P W    P W   W W                    P E",
     )