python fixes

Author: PandaWhoCodes

modiscript/MODI

@@ -32,19 +32,20 @@ def execute(filename):
 def main():
  if len(sys.argv) < 2 or '-h' in sys.argv or '--help' in sys.argv:
  usage()
- 
+
  filename = sys.argv[-1]
- #filename = "modi.chai"
+ # filename = "modi.chai"
  if '-d' in sys.argv or '--debug' in sys.argv:
  global DEBUG
  DEBUG = True
- 
+
  # check existence
  if not os.path.isfile(filename):
  raise ErrorHandler(FNF, filename)
  # execute
  execute(filename)
 
+
 if __name__ == '__main__':
  try:
  main()

modiscript/__pycache__/utils.cpython-36.pyc

@@ -1,4 +1,4 @@
-from utils import *
+from utils import LEX, ErrorHandler, ERROR, CONGRESS_RULE, STARTING_TROUBLE, MISQUOTE, WORDS
 import re
 import sys
 
@@ -23,18 +23,8 @@ def lexeme(lex, value=None, line=0, offset=0):
 
  @staticmethod
  def normalize(word):
- if word == 'nahin':
- word = 'nahi'
- elif word == 'tho':
- word = 'toh'
- elif word == 'bhayyo':
- word = 'bhaiyo'
- elif word == 'beheno':
- word = 'behno'
- elif word == 'thak':
- word = 'tak'
- elif word == 'jyada':
- word = 'zyada'
+ if word in WORDS:
+ word = WORDS[word]
  elif mitrooon.search(word):
  word = 'mitrooon'
  elif acche.search(word):
@@ -193,6 +183,6 @@ def _analyze_lexemes(self):
  yield Lexer.lexeme(*lex)
  self.stack = []
  self.clear = False
- if sys.version_info >= (3,7):
- return
+ if sys.version_info >= (3, 7):
+  return
  raise StopIteration()

modiscript/lexer.py

@@ -1,5 +1,5 @@
 from ast import *
-from utils import *
+from utils import LEX, ErrorHandler, ERROR, CONGRESS_RULE
 
 
 class Parser:
@@ -122,7 +122,7 @@ def _analyze_print(self, num):
  new_num, node = self._analyze_expr(num + 1)
  if node is not None:
  return new_num, Expr(value=Call(func=Name(id='print', ctx=Load()),
- args=[node], keywords=[]), **self._debug_details(num))
+  args=[node], keywords=[]), **self._debug_details(num))
  return num + 1, None
 
  def _analyze_until(self, num):
@@ -267,7 +267,8 @@ def _analyze_b(self, num):
  elif lexeme['lex'] == LEX['<']:
  op = Gt(**self._debug_details(num))
  op = Compare(left=prev, ops=[op], comparators=[node], **self._debug_details(num))
- if new_num + 1 < self.length and self.lex[new_num + 1]['lex'] == LEX['var'] and self.lex[new_num + 1]['value'] == 'nahi':
+ if new_num + 1 < self.length and self.lex[new_num + 1]['lex'] == LEX['var'] and self.lex[new_num + 1][
+ 'value'] == 'nahi':
  new_num += 1
  op = UnaryOp(op=Not(), operand=op, **self._debug_details(new_num))
  if new_num < self.length and self.lex[new_num]['lex'] == LEX['hai']:
@@ -293,7 +294,8 @@ def _analyze_b(self, num):
  elif lexeme['lex'] == LEX['!=']:
  op = NotEq(**self._debug_details(new_num))
  op = Compare(left=prev, ops=[op], comparators=[node], **self._debug_details(num))
- if new_num + 1 < self.length and self.lex[new_num + 1]['lex'] == LEX['var'] and self.lex[new_num + 1]['value'] == 'nahi':
+ if new_num + 1 < self.length and self.lex[new_num + 1]['lex'] == LEX['var'] and self.lex[new_num + 1][
+ 'value'] == 'nahi':
  new_num += 1
  op = UnaryOp(op=Not(), operand=op, **self._debug_details(new_num))
  if new_num + 1 < self.length and self.lex[new_num + 1]['lex'] == LEX['hai']:

modiscript/parser.py

@@ -40,6 +40,15 @@
  'false': 105
 }
 
+WORDS = {
+ "nahin": "nahi",
+ "tho": "toh",
+ "bhayyo": "bhaiyo",
+ "beheno": "behno",
+ "thak": "tak",
+ "jyada": "zyada"
+}
+
 
 def usage():
  print("Usage:", PROGRAM, "[options]", "filename")