merged
authormmahringer <s1520454056@students.fh-hagenberg.at>
Wed, 02 Aug 2017 10:56:36 +0200
changeset 51922183a5d68d6f
parent 5190 d3fa6cda3137
parent 5191 bcc8361629d7
child 5193 dfdf1b9349bb
child 5196 3ff8b687c30c
merged
isac-java/src/java/isac/gui/mawen/syntax/ast.scala
     1.1 --- a/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala	Wed Aug 02 09:56:12 2017 +0200
     1.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala	Wed Aug 02 10:56:36 2017 +0200
     1.3 @@ -109,7 +109,7 @@
     1.4    //test additional examples with BOX, CURSOR, GAP
     1.5    def test_BOX_CURSOR_GAP() {
     1.6      println("/--BEGIN isac.gui.mawen.asttrans.TestAst#test_BOX_CURSOR_GAP");
     1.7 -    
     1.8 +    println(Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3B))
     1.9      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_1))   
    1.10      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_2))   
    1.11      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_BOX_3))
    1.12 @@ -120,8 +120,8 @@
    1.13  
    1.14      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3A))   
    1.15      assertEquals("aaa + bbb", Ast.math_string_of(TestDATAeditor.nest_CURSOR_BOX_3B))
    1.16 -
    1.17 -
    1.18 +    
    1.19 +    println(Ast.math_string_of(TestDATAeditor.box_05))
    1.20      assertEquals("d_d x x + d_d x (sin (x ^ 2))", Ast.math_string_of(TestDATAeditor.box_05))   
    1.21      assertEquals("d_d bdv (sin (u)) = cos (u) * d_d bdv u", Ast.math_string_of(TestDATAeditor.box_06))   
    1.22      assertEquals("d_d x x + cos (x ^ 2) * d_d x #", Ast.math_string_of(TestDATAeditor.box_07_with_cursor))   
     2.1 --- a/isac-java/src/java/isac/gui/mawen/syntax/ast.scala	Wed Aug 02 09:56:12 2017 +0200
     2.2 +++ b/isac-java/src/java/isac/gui/mawen/syntax/ast.scala	Wed Aug 02 10:56:36 2017 +0200
     2.3 @@ -99,6 +99,7 @@
     2.4      case Appl(List(a, Constant("CURSOR"))) => to_str(a, prior, "none")
     2.5      case Appl(List(Constant("_list"), a)) => XLibrary.enclose("[", "]", to_list(a, prior, "none"))
     2.6      case Appl(List(Constant("_tuple"), a1, a2)) => to_tuple(Appl(List(Constant("_tuple"), a1, a2)), prior, "none")
     2.7 +    case Appl(List(Constant(str), a))  if str.startsWith("BOX") => to_str(a, prior, "none") 
     2.8      case Appl(List(Constant(str), a)) => {
     2.9        val uniop = XSyntax.isa_math(str)
    2.10        if (Set("Diff ", "Integrate ", "solve ").contains(uniop)) uniop + to_tuple(a, 0, "none")