Skip to content

Update to Python 3 Standards... again #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to Python 3 Standards... again #8

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cd8721
Update jispy.py to Python 3 Standards
ThePyProgrammer May 15, 2021
81944c5
Update to Python 3 Standards... again
ThePyProgrammer May 15, 2021
b8b776b
Merge branch 'master' into patch-1
ThePyProgrammer May 21, 2021
4dcc265
Merge pull request #1 from ThePyProgrammer/patch-1
ThePyProgrammer May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 27 additions & 28 deletions jispy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,21 @@ def __repr__(self):
switch this throw try typeof void with yield
enum
implements package protected static interface private public

Infinity NaN undefined
'''.split(); # list of unimplemented keywords (and globals)

keywords = iKeywords + uKeywords;

sym = makeSymbolTable(addLiterals = True); # true, false, null
map(sym, iKeywords);
map(sym, list('()[]!*/%+-><=,;{:}'));
map(sym, '>= <= === !== && ||'.split());
map(sym, '+= -='.split());
list(map(sym, iKeywords));
list(map(sym, list('()[]!*/%+-><=,;{:}')));
list(map(sym, '>= <= === !== && ||'.split()));
list(map(sym, '+= -='.split()));
# Note: '.' (dot) is not a symbol

badsym = makeSymbolTable(addLiterals = False);
map(badsym, '== != << >> *= /= %= ++ --'.split());
map(badsym, uKeywords);
list(map(badsym, '== != << >> *= /= %= ++ --'.split()));
list(map(badsym, uKeywords));
#############################################################

class LJErr(Exception): pass;
Expand Down Expand Up @@ -127,7 +126,7 @@ def segmentifyLine(s):
"Helps segmentify() with segmenting a single line." # segmentifyLine() uses an FSM which looks as follows:
mode = 'code'; quote = None; #
ans = ['']; # .--> (CODE) <--> STRING
for i in xrange(len(s)): #
for i in range(len(s)): #
if mode == 'code' and quote is None: # CODE is the start state and the only accepting state.
if s[i] in ['"', "'"]:
mode = 'string';
Expand Down Expand Up @@ -166,7 +165,7 @@ def subscriptify(s):
"Helps handleDot() change dots to subscripts."
if isPropertyName(s):
toAppend = [sym('['), s, sym(']')];
map(tokens.append, toAppend);
list(map(tokens.append, toAppend));
else:
raise LJSyntaxErr('illegal refinement ' + s);

Expand All @@ -183,13 +182,13 @@ def handleDot(x):
raise LJSyntaxErr('unexpected token ' + x + poken); # Thus,
# otherwise... # poken in [sym('}'), sym(')'), sym(']')]
splitLi = x[1 : ].split('.'); # is not used.
map(subscriptify, splitLi);
list(map(subscriptify, splitLi));
else: # if x[0] != '.'
splitLi = x.split('.');
baseId = splitLi[0]; # base/first identifier
if isValidName(baseId):
tokens.append(Name(baseId))
map(subscriptify, splitLi[1 : ]);
list(map(subscriptify, splitLi[1 : ]));
else:
raise LJSyntaxErr('unexpected token ' + baseId);

Expand Down Expand Up @@ -219,12 +218,12 @@ def lexNS(code):
"Tokenizes a non-string, i.e. un-quoted code snippet."
for tup in spacer:
code = code.replace(tup[0], tup[1]);
map(atomizeNS, code.split());
list(map(atomizeNS, code.split()));

def lexS(s):
"Shaves off quotes and decodes backslash escapes."
assert s[0] == s[-1] and s[-1] in ['"', "'"];
tokens.append(s[1 : -1].decode('string_escape'));
tokens.append(s[1 : -1].encode().decode('unicode_escape'));

for seg in segmentify(s):
if seg.startswith('"') or seg.startswith("'"):
Expand Down Expand Up @@ -252,7 +251,7 @@ def gmb(seq, i): # Get Matching (Closing) Bracket
left = seq[i];
right = brackets[left];
count = 0;
for j in xrange(i, len(seq), 1):
for j in range(i, len(seq), 1):
if seq[j] == left: count += 1;
elif seq[j] == right: count -= 1;
if count == 0: return j;
Expand Down Expand Up @@ -338,7 +337,7 @@ def parseExp(expLi):
"Tells functions from rest and parses them." # Remaining parts in an expression like operators etc.
while True: # are dealt with during interpreting
#print 'expLi = ', expLi, '\n';
funky = map(lambda x: x is sym('function'), expLi);
funky = [x is sym('function') for x in expLi];
#print ; print;
#print 'expLi = ', expLi;
#print 'funky = ', funky;
Expand Down Expand Up @@ -536,7 +535,7 @@ def parseFor(tokens, j):
pCond = parseExp(condCl); # parsed condition
pIncrs = parseForAssignments(incrCl); # only for error checking
pCode = yacc(codeCl) + pIncrs;# + incrCl + [sym(';')]); # parsed code; the UNPARSED increment clause is appended
map(tree.append, pAsgns); # Assignment is placed before while (in our parse tree)
list(map(tree.append, pAsgns)); # Assignment is placed before while (in our parse tree)
tree.append(['while', pCond, pCode]); # equivalent while loop
return rc + 1;

Expand Down Expand Up @@ -601,7 +600,7 @@ def gmob(li, i): # GetMatchingOpeningBacket. Cousin of gmb()
right = li[i];
left = brackets[right];
count = 0;
for j in xrange(i, -1, -1): # i may be -ive
for j in range(i, -1, -1): # i may be -ive
if li[j] == right : count += 1;
elif li[j] == left : count -= 1;
if count == 0: return j;
Expand All @@ -622,7 +621,7 @@ def cloneTree (iTree):
oTree = [];
for iNode in iTree:
if type(iNode) is Function:
oNode = Function(*map(cloneTree, [iNode.params, iNode.tree, iNode.iTokens]));
oNode = Function(*list(map(cloneTree, [iNode.params, iNode.tree, iNode.iTokens])));
elif type(iNode) is list:
oNode = cloneTree(iNode);
else:
Expand All @@ -647,7 +646,7 @@ class Env(dict):
"Defines a scope/context for execution."
def __init__(self, params=[], args=[], parent=None):
if len(params) != len(args): raise Exception(); # internal error
self.update(zip(params, args));
self.update(list(zip(params, args)));
self.parent = parent;
self.isGlobal = (parent is None);
if self.isGlobal: self.depth = 0;
Expand Down Expand Up @@ -745,7 +744,7 @@ def subNames(expLi):
"Substitutes identifier names w/ their values."
#print 'entering subNames, expLi = ', expLi;
count = 0; # counts { and }
for j in xrange(len(expLi)):
for j in range(len(expLi)):
tok = expLi[j];
if tok is sym('{'): count += 1; # Keys in objects `{a: "apple"}` are NOT substituted
elif tok is sym('}'): count -= 1;
Expand Down Expand Up @@ -1006,7 +1005,7 @@ def numBinop(a, op, b):
}[op](a, b);

def checkChaining(expLi, op, j): # On Chromium,
nonAsso = map(sym, '> < >= <= === !=='.split()); # 1 === 1 === 1 --> false
nonAsso = list(map(sym, '> < >= <= === !=='.split())); # 1 === 1 === 1 --> false
if j + 2 >= len(expLi): return; # because,
op2 = expLi[j + 2]; # 1 === 1 --> true
rawMsg = 'operators %s and %s cannot be chained'; # true === 1 --> false
Expand All @@ -1030,18 +1029,18 @@ def getRetExpLi(inter):
except (AssertionError, IndexError):
raise LJSyntaxErr('unexpected operator ' + op);
checkChaining(expLi, op, j);
indiOps = map(sym, '=== !== && ||'.split());
indiOps = list(map(sym, '=== !== && ||'.split()));
if op in indiOps:
inter = indiBinop(a, op, b);
return getRetExpLi(inter);
# otherwise...
if type(a) == type(b) and type(b) in [str, float]:
strNumOps = map(sym, '>= <= > < +'.split());
strNumOps = list(map(sym, '>= <= > < +'.split()));
if op in strNumOps:
inter = strNumBinop(a, op, b);
return getRetExpLi(inter);
elif type(b) is float:
numOps = map(sym, list('*/%-'));
numOps = list(map(sym, list('*/%-')));
assert op in numOps;
inter = numBinop(a, op, b);
return getRetExpLi(inter);
Expand Down Expand Up @@ -1127,7 +1126,7 @@ def runInit(stmt, env):

def runIfLadder(stmt, env):
"Helps run through an if-ladder."
for j in xrange(1, len(stmt), 2):
for j in range(1, len(stmt), 2):
expLi, code = stmt[j], stmt[j+1];
if isTruthy(eval(expLi, env)):
run(code, env, maxLoopTime, writer);
Expand Down Expand Up @@ -1243,7 +1242,7 @@ def n_len(x):

def n_keys(dicty):
"Returns an array of keys in an object `obj`."
if type(dicty) is dict: return dicty.keys();
if type(dicty) is dict: return list(dicty.keys());
raise LJTypeErr('%s has no keys()' % n_type(dicty));

def n_del(x, y):
Expand Down Expand Up @@ -1374,7 +1373,7 @@ def run(self, prog, env=None, console=False): # console <--> isInConsoleMode?
writer = self.writer if console else None;
run(tree, env, self.maxLoopTime, writer);
except LJErr as e:
print('%s: %s' % (type(e).__name__[2:] + 'or' , e))
print(('%s: %s' % (type(e).__name__[2:] + 'or' , e)))
except LJJump as e:
if isa(e, LJReturn):
print('SyntaxError: unexpected return statement');
Expand Down Expand Up @@ -1402,7 +1401,7 @@ def console(rt=None, semify=False, prompt='LJ> '): # semify __tries__ to a
inp = ''; # If you do so, runtime will not be renewed on each call to console();
while True:
inp += '\n';
try: inp += raw_input(prompt) ;
try: inp += input(prompt);
except (EOFError):
print('');
return;
Expand Down