From 759098ce9e11fca4b20a301f47ca6c25e3d943c1 Mon Sep 17 00:00:00 2001
From: Ian Fisher <iafisher@protonmail.com>
Date: Mon, 4 Feb 2019 11:44:00 -0500
Subject: [PATCH] Factor out match_value method in Parser class

---
 hera/parser.py | 76 ++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/hera/parser.py b/hera/parser.py
index 8533ba4..376f0e7 100644
--- a/hera/parser.py
+++ b/hera/parser.py
@@ -124,46 +124,10 @@ def match_optional_arglist(self):
                 else:
                     break
 
-            if self.lexer.tkn.type == Token.INT:
-                # Detect zero-prefixed octal numbers.
-                prefix = self.lexer.tkn.value[:2]
-                if len(prefix) == 2 and prefix[0] == "0" and prefix[1].isdigit():
-                    base = 8
-                    if self.settings.warn_octal_on:
-                        self.warn('consider using "0o" prefix for octal numbers')
-                else:
-                    base = 0
-
-                try:
-                    arg_as_int = int(self.lexer.tkn.value, base=base)
-                except ValueError:
-                    self.err("invalid integer literal")
-                else:
-                    self.lexer.tkn.value = arg_as_int
-                    args.append(self.lexer.tkn)
-                self.lexer.next_token()
-            elif self.lexer.tkn.type == Token.CHAR:
-                args.append(
-                    Token(
-                        Token.INT,
-                        ord(self.lexer.tkn.value),
-                        location=self.lexer.tkn.location,
-                    )
-                )
-                self.lexer.next_token()
-            elif self.lexer.tkn.type == Token.REGISTER:
-                try:
-                    i = register_to_index(self.lexer.tkn.value)
-                except HERAError:
-                    self.err("{} is not a valid register".format(self.lexer.tkn.value))
-                else:
-                    self.lexer.tkn.value = i
-                    args.append(self.lexer.tkn)
-                self.lexer.next_token()
-            else:
-                args.append(self.lexer.tkn)
-                self.lexer.next_token()
+            val = self.match_value()
+            args.append(val)
 
+            self.lexer.next_token()
             if self.lexer.tkn.type == Token.RPAREN:
                 break
             elif self.lexer.tkn.type != Token.COMMA:
@@ -178,6 +142,40 @@ def match_optional_arglist(self):
                 self.lexer.next_token()
         return args
 
+    def match_value(self):
+        if self.lexer.tkn.type == Token.INT:
+            # Detect zero-prefixed octal numbers.
+            prefix = self.lexer.tkn.value[:2]
+            if len(prefix) == 2 and prefix[0] == "0" and prefix[1].isdigit():
+                base = 8
+                if self.settings.warn_octal_on:
+                    self.warn('consider using "0o" prefix for octal numbers')
+            else:
+                base = 0
+
+            try:
+                arg_as_int = int(self.lexer.tkn.value, base=base)
+            except ValueError:
+                self.err("invalid integer literal")
+                # 1 is a neutral value that is valid anywhere an integer is.
+                arg_as_int = 1
+            self.lexer.tkn.value = arg_as_int
+            return self.lexer.tkn
+        elif self.lexer.tkn.type == Token.CHAR:
+            return Token(
+                Token.INT, ord(self.lexer.tkn.value), location=self.lexer.tkn.location
+            )
+        elif self.lexer.tkn.type == Token.REGISTER:
+            try:
+                i = register_to_index(self.lexer.tkn.value)
+            except HERAError:
+                self.err("{} is not a valid register".format(self.lexer.tkn.value))
+                i = 0
+            self.lexer.tkn.value = i
+            return self.lexer.tkn
+        else:
+            return self.lexer.tkn
+
     def match_include(self):
         root_path = self.lexer.path
         tkn = self.lexer.next_token()