Use correct name for brace/bracket

eatonphil · May 7, 2018 · 4d5f429 · 4d5f429
1 parent 1dd1145
commit 4d5f429
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/pj/constants.py b/pj/constants.py
@@ -1,7 +1,7 @@
 JSON_COMMA = ','
 JSON_COLON = ':'
-JSON_LEFTPAREN = '['
-JSON_RIGHTPAREN = ']'
-JSON_LEFTBRACKET = '{'
-JSON_RIGHTBRACKET = '}'
+JSON_LEFTBRACKET = '['
+JSON_RIGHTBRACKET = ']'
+JSON_LEFTBRACE = '{'
+JSON_RIGHTBRACE = '}'
 JSON_QUOTE = '"'
diff --git a/pj/lexer.py b/pj/lexer.py
@@ -2,8 +2,8 @@
 
 JSON_QUOTE = '"'
 JSON_WHITESPACE = [' ', '\t', '\b', '\n', '\r']
-JSON_SYNTAX = [JSON_COMMA, JSON_COLON, JSON_LEFTPAREN, JSON_RIGHTPAREN,
-               JSON_LEFTBRACKET, JSON_RIGHTBRACKET]
+JSON_SYNTAX = [JSON_COMMA, JSON_COLON, JSON_LEFTBRACKET, JSON_RIGHTBRACKET,
+               JSON_LEFTBRACE, JSON_RIGHTBRACE]
 
 FALSE_LEN = len('false')
 TRUE_LEN = len('true')

diff --git a/pj/parser.py b/pj/parser.py
@@ -5,15 +5,15 @@ def parse_array(tokens):
     json_array = []
 
     t = tokens[0]
-    if t == JSON_RIGHTPAREN:
+    if t == JSON_RIGHTBRACKET:
         return json_array, tokens[1:]
 
     while True:
         json, tokens = parse(tokens)
         json_array.append(json)
 
         t = tokens[0]
-        if t == JSON_RIGHTPAREN:
+        if t == JSON_RIGHTBRACKET:
             return json_array, tokens[1:]
         elif t != JSON_COMMA:
             raise Exception('Expected comma after object in array')
@@ -27,7 +27,7 @@ def parse_object(tokens):
     json_object = {}
 
     t = tokens[0]
-    if t == JSON_RIGHTBRACKET:
+    if t == JSON_RIGHTBRACE:
         return json_object, tokens[1:]
 
     while True:
@@ -45,7 +45,7 @@ def parse_object(tokens):
         json_object[json_key] = json_value
 
         t = tokens[0]
-        if t == JSON_RIGHTBRACKET:
+        if t == JSON_RIGHTBRACE:
             return json_object, tokens[1:]
         elif t != JSON_COMMA:
             raise Exception('Expected comma after pair in object, got: {}'.format(t))
@@ -57,12 +57,12 @@ def parse_object(tokens):
 def parse(tokens, is_root=False):
     t = tokens[0]
 
-    if is_root and t != JSON_LEFTBRACKET:
+    if is_root and t != JSON_LEFTBRACE:
         raise Exception('Root must be an object')
 
-    if t == JSON_LEFTPAREN:
+    if t == JSON_LEFTBRACKET:
         return parse_array(tokens[1:])
-    elif t == JSON_LEFTBRACKET:
+    elif t == JSON_LEFTBRACE:
         return parse_object(tokens[1:])
     else:
         return t, tokens[1:]