11import unittest
2+
23from tokens import Token , TokenType
3- from parser import Parser
4+ from parser_ import Parser
45from nodes import *
56
67class TestParser (unittest .TestCase ):
@@ -15,69 +16,69 @@ def test_numbers(self):
1516 node = Parser (tokens ).parse ()
1617 self .assertEqual (node , NumberNode (51.2 ))
1718
18- def test_individual_operations (self ):
19+ def test_single_operations (self ):
1920 tokens = [
2021 Token (TokenType .NUMBER , 27 ),
2122 Token (TokenType .PLUS ),
2223 Token (TokenType .NUMBER , 14 ),
2324 ]
25+
2426 node = Parser (tokens ).parse ()
2527 self .assertEqual (node , AddNode (NumberNode (27 ), NumberNode (14 )))
26-
27-
28+
2829 tokens = [
2930 Token (TokenType .NUMBER , 27 ),
3031 Token (TokenType .MINUS ),
3132 Token (TokenType .NUMBER , 14 ),
3233 ]
34+
3335 node = Parser (tokens ).parse ()
3436 self .assertEqual (node , SubtractNode (NumberNode (27 ), NumberNode (14 )))
35-
36-
37+
3738 tokens = [
3839 Token (TokenType .NUMBER , 27 ),
3940 Token (TokenType .MULTIPLY ),
4041 Token (TokenType .NUMBER , 14 ),
4142 ]
43+
4244 node = Parser (tokens ).parse ()
4345 self .assertEqual (node , MultiplyNode (NumberNode (27 ), NumberNode (14 )))
44-
45-
46-
46+
4747 tokens = [
4848 Token (TokenType .NUMBER , 27 ),
4949 Token (TokenType .DIVIDE ),
5050 Token (TokenType .NUMBER , 14 ),
5151 ]
52+
5253 node = Parser (tokens ).parse ()
5354 self .assertEqual (node , DivideNode (NumberNode (27 ), NumberNode (14 )))
5455
5556 def test_full_expression (self ):
5657 tokens = [
5758 Token (TokenType .NUMBER , 27 ),
5859 Token (TokenType .PLUS ),
59-
60- Token (TokenType .LPARENT ),
60+ Token (TokenType .LPAREN ),
6161 Token (TokenType .NUMBER , 43 ),
6262 Token (TokenType .DIVIDE ),
6363 Token (TokenType .NUMBER , 36 ),
6464 Token (TokenType .MINUS ),
6565 Token (TokenType .NUMBER , 48 ),
66- Token (TokenType .MILTIPLY ),
67- Token (TokenType .RPARENT ),
68-
69- Token (TokenType .NUMBER , 51 )
66+ Token (TokenType .RPAREN ),
67+ Token (TokenType .MULTIPLY ),
68+ Token (TokenType .NUMBER , 51 ),
7069 ]
70+
7171 node = Parser (tokens ).parse ()
7272 self .assertEqual (node , AddNode (
7373 NumberNode (27 ),
74- MultiplyNode (
75- SubtractNode (
74+ MultiplyNode (
75+ SubtractNode (
76+ DivideNode (
7677 NumberNode (43 ),
7778 NumberNode (36 )
7879 ),
7980 NumberNode (48 )
8081 ),
8182 NumberNode (51 )
8283 )
83- )
84+ ))
0 commit comments