fix case of thenClause, typo

Macaulay2 · Aug 8, 2024 · b59eb20 · b59eb20
1 parent a867e8d
commit b59eb20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/M2/Macaulay2/d/convertr.d b/M2/Macaulay2/d/convertr.d
@@ -474,10 +474,10 @@ export convert0(e:ParseTree):Code := (
 	  p := combinePosition(q.Operator.position,token.position);
 	  nd := nestingDepth(sym.frameID,token.dictionary);
 	  Code(localSymbolClosureCode(nd,sym,p)))
-     is i:TryThenElse do Code(tryCode(convert(i.primary),            convert(i.sequel),              unseq(c:=convert0(i.alternate)), combinePosition(i.tryToken.position,codePosition(c))))
-     is i:TryThen     do Code(tryCode(convert(i.primary),            convert(c:=convert0(i.sequel)), NullCode,                        combinePosition(i.tryToken.position,codePosition(c))))
-     is i:TryElse     do Code(tryCode(convert(i.primary),            NullCode,                       unseq(c:=convert0(i.alternate)), combinePosition(i.tryToken.position,codePosition(c))))
-     is i:Try         do Code(tryCode(unseq(c:=convert0(i.primary)), NullCode,                       NullCode,                        combinePosition(i.tryToken.position,codePosition(c))))
+     is i:TryThenElse do Code(tryCode(convert(i.primary),            convert(i.sequel),            unseq(c:=convert0(i.alternate)), combinePosition(i.tryToken.position,codePosition(c))))
+     is i:TryThen     do Code(tryCode(convert(i.primary),            unseq(c:=convert0(i.sequel)), NullCode,                        combinePosition(i.tryToken.position,codePosition(c))))
+     is i:TryElse     do Code(tryCode(convert(i.primary),            NullCode,                     unseq(c:=convert0(i.alternate)), combinePosition(i.tryToken.position,codePosition(c))))
+     is i:Try         do Code(tryCode(unseq(c:=convert0(i.primary)), NullCode,                     NullCode,                        combinePosition(i.tryToken.position,codePosition(c))))
      is i:Catch       do Code(catchCode(unseq(c:=convert0(i.primary)),combinePosition(i.catchToken.position,codePosition(c))))
      is u:Postfix     do Code(unaryCode(u.Operator.entry.postfix,unseq(c:=convert0(u.lhs)),combinePosition(codePosition(c),u.Operator.position)))
      is d:dummy do dummyCode

diff --git a/M2/Macaulay2/d/parser.d b/M2/Macaulay2/d/parser.d
@@ -561,8 +561,8 @@ export size(e:ParseTree):int := (
      is x:LocalQuote do Ccode(int,"sizeof(*",x,")") + size(x.rhs) + size(x.Operator)
      is x:Parentheses do Ccode(int,"sizeof(*",x,")") + size(x.left) + size(x.right) + size(x.contents)
      is x:EmptyParentheses do Ccode(int,"sizeof(*",x,")") + size(x.left) + size(x.right)
-     is x:IfThen do Ccode(int,"sizeof(*",x,")") + size(x.ifToken) + size(x.predicate) + size(x.thenclause)
-     is x:IfThenElse do Ccode(int,"sizeof(*",x,")") + size(x.ifToken) + size(x.predicate) + size(x.thenclause) + size(x.elseClause)
+     is x:IfThen do Ccode(int,"sizeof(*",x,")") + size(x.ifToken) + size(x.predicate) + size(x.thenClause)
+     is x:IfThenElse do Ccode(int,"sizeof(*",x,")") + size(x.ifToken) + size(x.predicate) + size(x.thenClause) + size(x.elseClause)
     is x:TryThenElse do Ccode(int,"sizeof(*",x,")") + size(x.tryToken) + size(x.primary) + size(x.thenToken) + size(x.sequel) + size(x.elseToken) + size(x.alternate)
     is x:TryThen     do Ccode(int,"sizeof(*",x,")") + size(x.tryToken) + size(x.primary) + size(x.thenToken) + size(x.sequel)
     is x:TryElse     do Ccode(int,"sizeof(*",x,")") + size(x.tryToken) + size(x.primary)                                      + size(x.elseToken) + size(x.alternate)