Skip to content

Commit 2b51c37

Browse files
committed
tmp
1 parent d990b15 commit 2b51c37

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

mathics/core/convert/prettyprint.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def holdform_expression_to_2d_text(expr, evaluation, form, **kwargs):
108108

109109

110110
def pre_pos_infix_expression_to_2d_text(expr, evaluation, form, **kwargs):
111+
print("processing ", expr)
111112
elements = expr.elements
112113
if not (0 <= len(elements) <= 4):
113114
raise _WrongFormattedExpression
@@ -201,7 +202,11 @@ def pre_pos_infix_expression_to_2d_text(expr, evaluation, form, **kwargs):
201202
for index, operand in enumerate(operands):
202203
operand_txt = expression_to_2d_text(operand, evaluation, form, **kwargs)
203204
cmp_precedence = compare_precedence(operand, precedence)
204-
if cmp_precedence == -1 or (cmp_precedence == 0 and parenthesized):
205+
print("calling compare_precedence", [operand, precedence, cmp_precedence])
206+
if cmp_precedence is not None and (
207+
cmp_precedence == -1 or (cmp_precedence == 0 and parenthesized)
208+
):
209+
print("->parenthesize")
205210
operand_txt = parenthesize(operand_txt)
206211

207212
if index == 0:
@@ -335,6 +340,7 @@ def plus_expression_to_2d_text(expr, evaluation, form, **kwargs):
335340

336341

337342
def power_expression_to_2d_text(expr, evaluation, form, **kwargs):
343+
print("@@@@@@@@@@@power_expr")
338344
if len(expr.elements) != 2:
339345
return default_expression_to_2d_text(expr, evaluation, form, **kwargs)
340346
if kwargs.get("2d", False):
@@ -497,6 +503,7 @@ def stringform_expression_to_2d_text(expr, evaluation, form, **kwargs):
497503

498504

499505
def superscript_expression_to_2d_text(expr, evaluation, form, **kwargs):
506+
print("Superscript", [expr])
500507
if len(expr.elements) != 2:
501508
raise _WrongFormattedExpression
502509
if kwargs.get("2d", False):

mathics/eval/makeboxes.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def compare_precedence(
6161
is higher, return 1, otherwise -1.
6262
If precedences cannot be compared, return None.
6363
"""
64-
6564
from mathics.builtin import builtins_precedence
6665

6766
while element.has_form("HoldForm", 1):
@@ -81,10 +80,7 @@ def compare_precedence(
8180

8281
if element_prec is None:
8382
return None
84-
85-
if element_prec == precedence:
86-
return 0
87-
return 1 if element_prec > precedence else -1
83+
return 0 if element_prec == precedence else (1 if element_prec > precedence else -1)
8884

8985

9086
def eval_makeboxes(expr, evaluation, f=SymbolStandardForm):

0 commit comments

Comments
 (0)