# HG changeset patch # User haftmann # Date 1282817989 -7200 # Node ID f9837065b5e88dbd6bbcf7fea62b5b81f78d4444 # Parent eb7bc47f062b294306b427eb11924a14b3f91218 prevent line breaks after Scala symbolic operators diff -r eb7bc47f062b -r f9837065b5e8 src/HOL/HOL.thy --- a/src/HOL/HOL.thy Thu Aug 26 10:23:25 2010 +0200 +++ b/src/HOL/HOL.thy Thu Aug 26 12:19:49 2010 +0200 @@ -1924,7 +1924,7 @@ (Haskell "True" and "False" and "not" and infixl 3 "&&" and infixl 2 "||" and "!(if (_)/ then (_)/ else (_))") - (Scala "true" and "false" and "'!/ _" + (Scala "true" and "false" and "'! _" and infixl 3 "&&" and infixl 1 "||" and "!(if ((_))/ (_)/ else (_))") diff -r eb7bc47f062b -r f9837065b5e8 src/HOL/Imperative_HOL/Heap_Monad.thy --- a/src/HOL/Imperative_HOL/Heap_Monad.thy Thu Aug 26 10:23:25 2010 +0200 +++ b/src/HOL/Imperative_HOL/Heap_Monad.thy Thu Aug 26 12:19:49 2010 +0200 @@ -478,6 +478,7 @@ code_include Scala "Heap" {*import collection.mutable.ArraySeq + def bind[A, B](f: Unit => A, g: A => Unit => B): Unit => B = (_: Unit) => g (f ()) () class Ref[A](x: A) { diff -r eb7bc47f062b -r f9837065b5e8 src/HOL/Library/Code_Integer.thy --- a/src/HOL/Library/Code_Integer.thy Thu Aug 26 10:23:25 2010 +0200 +++ b/src/HOL/Library/Code_Integer.thy Thu Aug 26 12:19:49 2010 +0200 @@ -51,14 +51,14 @@ (SML "IntInf.- ((_), 1)") (OCaml "Big'_int.pred'_big'_int") (Haskell "!(_/ -/ 1)") - (Scala "!(_/ -/ 1)") + (Scala "!(_ -/ 1)") (Eval "!(_/ -/ 1)") code_const Int.succ (SML "IntInf.+ ((_), 1)") (OCaml "Big'_int.succ'_big'_int") (Haskell "!(_/ +/ 1)") - (Scala "!(_/ +/ 1)") + (Scala "!(_ +/ 1)") (Eval "!(_/ +/ 1)") code_const "op + \ int \ int \ int" diff -r eb7bc47f062b -r f9837065b5e8 src/HOL/ex/Numeral.thy --- a/src/HOL/ex/Numeral.thy Thu Aug 26 10:23:25 2010 +0200 +++ b/src/HOL/ex/Numeral.thy Thu Aug 26 12:19:49 2010 +0200 @@ -1033,14 +1033,14 @@ (SML "IntInf.- ((_), 1)") (OCaml "Big'_int.pred'_big'_int") (Haskell "!(_/ -/ 1)") - (Scala "!(_/ -/ 1)") + (Scala "!(_ -/ 1)") (Eval "!(_/ -/ 1)") code_const Int.succ (SML "IntInf.+ ((_), 1)") (OCaml "Big'_int.succ'_big'_int") (Haskell "!(_/ +/ 1)") - (Scala "!(_/ +/ 1)") + (Scala "!(_ +/ 1)") (Eval "!(_/ +/ 1)") code_const "op + \ int \ int \ int"