Merge pull request kozec#4 from chewi/py3.12

Python 3.12 fixes and 3.14 deprecation fixes

Author: C0rn3j

scc/cheader.py

@@ -59,8 +59,8 @@ def eval_expr(expr):
 	""" Eval and expression inside a #define using a suppart of python grammar """
 
 	def _eval(node):
-		if isinstance(node, ast.Num):
-			return node.n
+		if isinstance(node, ast.Constant):
+			return node.value
 		elif isinstance(node, ast.BinOp):
 			return OPERATORS[type(node.op)](_eval(node.left), _eval(node.right))
 		elif isinstance(node, ast.UnaryOp):

scc/parser.py

@@ -136,7 +136,7 @@ def _tokens_left(self):
 	def _parse_parameter(self):
 		""" Parses single parameter """
 		t = self._next_token()
-		while t.type == TokenType.NEWLINE or t.value == "\n":
+		while t.type in (TokenType.NL, TokenType.NEWLINE) or t.value == "\n":
 			if not self._tokens_left():
 				raise ParseError("Expected parameter at end of string")
 			t = self._next_token()
@@ -236,7 +236,7 @@ def _parse_parameters(self):
 			parameters.append(self._parse_parameter())
 			# Check if next token is either ')' or ','
 			t = self._peek_token()
-			while t.type == TokenType.NEWLINE or t.value == "\n":
+			while t.type in (TokenType.NL, TokenType.NEWLINE) or t.value == "\n":
 				self._next_token()
 				if not self._tokens_left():
 					raise ParseError("Expected ',' or end of parameter list after parameter '%s'" % (parameters[-1],))
@@ -310,8 +310,8 @@ def _parse_action(self, frm=Action.ALL):
 			action1 = self._create_action(action_class, *parameters)
 			action2 = self._parse_action()
 			return MultiAction(action1, action2)
-		
-		if t.type == TokenType.NEWLINE or t.value == "\n":
+
+		if t.type in (TokenType.NL, TokenType.NEWLINE) or t.value == "\n":
 			# Newline can be used to join actions instead of 'and'
 			self._next_token()
 			if not self._tokens_left():
@@ -324,11 +324,11 @@ def _parse_action(self, frm=Action.ALL):
 			action1 = self._create_action(action_class, *parameters)
 			action2 = self._parse_action()
 			return MultiAction(action1, action2)
-		
+
 		if t.type == TokenType.OP and t.value == ';':
 			# Two (or more) actions joined by ';'
 			self._next_token()
-			while self._tokens_left() and self._peek_token().type == TokenType.NEWLINE:
+			while self._tokens_left() and self._peek_token().type in (TokenType.NL, TokenType.NEWLINE):
 				self._next_token()
 			if not self._tokens_left():
 				# Having ';' at end of string is not actually error