# HG changeset patch # User Lars Hupel # Date 1495364444 -7200 # Node ID d76937b773d9fc8f47f9ddb76a9649636d24c94c # Parent 750efd46bba9ef013164c314715a9796c02148c4 adapt to Scala 2.12.x diff -r 750efd46bba9 -r d76937b773d9 src/HOL/Library/Code_Char.thy --- a/src/HOL/Library/Code_Char.thy Sat May 20 21:05:25 2017 +0200 +++ b/src/HOL/Library/Code_Char.thy Sun May 21 13:00:44 2017 +0200 @@ -16,7 +16,7 @@ and (Scala) "Char" setup \ - fold String_Code.add_literal_char ["SML", "OCaml", "Haskell", "Scala"] + fold String_Code.add_literal_char ["SML", "OCaml", "Haskell", "Scala"] #> String_Code.add_literal_list_string "Haskell" \ @@ -30,7 +30,7 @@ (SML) "!(Char.chr o IntInf.toInt)" and (OCaml) "Char.chr (Big'_int.int'_of'_big'_int _)" and (Haskell) "!(let chr k | (0 <= k && k < 256) = Prelude.toEnum k :: Prelude.Char in chr . Prelude.fromInteger)" - and (Scala) "!((k: BigInt) => if (BigInt(0) <= k && k < BigInt(256)) k.charValue else error(\"character value out of range\"))" + and (Scala) "!((k: BigInt) => if (BigInt(0) <= k && k < BigInt(256)) k.charValue else sys.error(\"character value out of range\"))" | class_instance char :: equal \ (Haskell) - | constant "HOL.equal :: char \ char \ bool" \ @@ -80,7 +80,7 @@ | constant "Orderings.less_eq :: String.literal \ String.literal \ bool" \ (SML) "!((_ : string) <= _)" and (OCaml) "!((_ : string) <= _)" - \ \Order operations for @{typ String.literal} work in Haskell only + \ \Order operations for @{typ String.literal} work in Haskell only if no type class instance needs to be generated, because String = [Char] in Haskell and @{typ "char list"} need not have the same order as @{typ String.literal}.\ and (Haskell) infix 4 "<="