# HG changeset patch # User mmahringer # Date 1501664196 -7200 # Node ID 2183a5d68d6fe0cba3470e64a70cbaa722d8067e # Parent d3fa6cda31378a1a79cd5ea6a2f20f08d8fb8834# Parent bcc8361629d7519ad9309e562501c28cdd3f6c45 merged diff -r d3fa6cda3137 -r 2183a5d68d6f isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala --- a/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala Wed Aug 02 09:56:12 2017 +0200 +++ b/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala Wed Aug 02 10:56:36 2017 +0200 @@ -109,7 +109,7 @@ //test additional examples with BOX, CURSOR, GAP def test_BOX_CURSOR_GAP() { println("/--BEGIN isac.gui.mawen.asttrans.TestAst#test_BOX_CURSOR_GAP"); - + println(Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3B)) assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_1)) assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_2)) assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_3)) @@ -120,8 +120,8 @@ assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3A)) assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3B)) - - + + println(Ast.math_string_of(TestDATAeditor.box_05)) assertEquals("d_d x x + d_d x (sin (x ^ 2))", Ast.math_string_of(TestDATAeditor.box_05)) assertEquals("d_d bdv (sin (u)) = cos (u) * d_d bdv u", Ast.math_string_of(TestDATAeditor.box_06)) assertEquals("d_d x x + cos (x ^ 2) * d_d x #", Ast.math_string_of(TestDATAeditor.box_07_with_cursor)) diff -r d3fa6cda3137 -r 2183a5d68d6f isac-java/src/java/isac/gui/mawen/syntax/ast.scala --- a/isac-java/src/java/isac/gui/mawen/syntax/ast.scala Wed Aug 02 09:56:12 2017 +0200 +++ b/isac-java/src/java/isac/gui/mawen/syntax/ast.scala Wed Aug 02 10:56:36 2017 +0200 @@ -99,6 +99,7 @@ case Appl(List(a, Constant("CURSOR"))) => to_str(a, prior, "none") case Appl(List(Constant("_list"), a)) => XLibrary.enclose("[", "]", to_list(a, prior, "none")) case Appl(List(Constant("_tuple"), a1, a2)) => to_tuple(Appl(List(Constant("_tuple"), a1, a2)), prior, "none") + case Appl(List(Constant(str), a)) if str.startsWith("BOX") => to_str(a, prior, "none") case Appl(List(Constant(str), a)) => { val uniop = XSyntax.isa_math(str) if (Set("Diff ", "Integrate ", "solve ").contains(uniop)) uniop + to_tuple(a, 0, "none")