--- a/tools/JavaScanner.st	Mon Jul 11 14:58:02 2016 +0200
+++ b/tools/JavaScanner.st	Mon Jul 11 14:58:04 2016 +0200
@@ -106,44 +106,44 @@
     TypeArray := Array new:256.
 
     block := [:s :char | s nextNumber].
-    ($0 asciiValue) to:($9 asciiValue) do:[:index |
+    ($0 codePoint) to:($9 codePoint) do:[:index |
         ActionArray at:index put:block
     ].
 
     block := [:s :char | s nextSingleCharacterToken:char].
     #( $: $; $, ${ $} $( $) $[ $] $_ $? $@) do:[:ch |
-        ActionArray at:(ch asciiValue) put:block
+        ActionArray at:(ch codePoint) put:block
     ].
 
     block := [:s :char | s nextIdentifier].
-    ($a asciiValue) to:($z asciiValue) do:[:index |
+    ($a codePoint) to:($z codePoint) do:[:index |
         ActionArray at:index put:block
     ].
-    ($A asciiValue) to:($Z asciiValue) do:[:index |
+    ($A codePoint) to:($Z codePoint) do:[:index |
         ActionArray at:index put:block
     ].
-    ActionArray at:$_ asciiValue put:block.
+    ActionArray at:$_ codePoint put:block.
 
-    ActionArray at:$$ asciiValue put:block.
+    ActionArray at:$$ codePoint put:block.
 
-    ActionArray at:($. asciiValue) put:[:s :char | s nextDotOrFloatOrEllipsis].
+    ActionArray at:($. codePoint) put:[:s :char | s nextDotOrFloatOrEllipsis].
 
-    ActionArray at:($' asciiValue) put:[:s :char | s nextString:$' character:true].
-    ActionArray at:($" asciiValue) put:[:s :char | s nextString:$" character:false].
-    ActionArray at:($!! asciiValue) put:[:s :char | s nextMulti:#(($= #'!!=')) after:char].
-    ActionArray at:($= asciiValue) put:[:s :char | s nextMulti:#(($= #'==')) after:char].
-    ActionArray at:($< asciiValue) put:[:s :char | s nextMulti:#(($= #'<=') ($< #'<<')) after:char].
-    ActionArray at:($> asciiValue) put:[:s :char | s nextMulti:#(($= #'>=') ($> #'>>' $> #'>>>' $= #'>>>=')) after:char].
+    ActionArray at:($' codePoint) put:[:s :char | s nextString:$' character:true].
+    ActionArray at:($" codePoint) put:[:s :char | s nextString:$" character:false].
+    ActionArray at:($!! codePoint) put:[:s :char | s nextMulti:#(($= #'!!=')) after:char].
+    ActionArray at:($= codePoint) put:[:s :char | s nextMulti:#(($= #'==')) after:char].
+    ActionArray at:($< codePoint) put:[:s :char | s nextMulti:#(($= #'<=') ($< #'<<')) after:char].
+    ActionArray at:($> codePoint) put:[:s :char | s nextMulti:#(($= #'>=') ($> #'>>' $> #'>>>' $= #'>>>=')) after:char].
 
-    ActionArray at:($- asciiValue) put:[:s :char | s nextMulti:#(($- #'--') ($= #'-=')) after:char].
-    ActionArray at:($+ asciiValue) put:[:s :char | s nextMulti:#(($+ #'++') ($= #'+=')) after:char].
-    ActionArray at:($* asciiValue) put:[:s :char | s nextMulti:#(($= #'*=')) after:char].
-    ActionArray at:($/ asciiValue) put:[:s :char | s nextMulti:#(($= #'/=') ($/ nil #skipEOLComment) ($* nil #skipComment)) after:char].
-    ActionArray at:($% asciiValue) put:[:s :char | s nextMulti:#(($= #'%=')) after:char].
-    ActionArray at:($& asciiValue) put:[:s :char | s nextMulti:#(($= #'&=') ($& #'&&')) after:char].
-    ActionArray at:($^ asciiValue) put:[:s :char | s nextMulti:#(($= #'^=')) after:char].
-    ActionArray at:($~ asciiValue) put:[:s :char | s nextMulti:#(($= #'~=')) after:char].
-    ActionArray at:($| asciiValue) put:[:s :char | s nextMulti:#(($= #'|=') ($| #'||')) after:char].
+    ActionArray at:($- codePoint) put:[:s :char | s nextMulti:#(($- #'--') ($= #'-=')) after:char].
+    ActionArray at:($+ codePoint) put:[:s :char | s nextMulti:#(($+ #'++') ($= #'+=')) after:char].
+    ActionArray at:($* codePoint) put:[:s :char | s nextMulti:#(($= #'*=')) after:char].
+    ActionArray at:($/ codePoint) put:[:s :char | s nextMulti:#(($= #'/=') ($/ nil #skipEOLComment) ($* nil #skipComment)) after:char].
+    ActionArray at:($% codePoint) put:[:s :char | s nextMulti:#(($= #'%=')) after:char].
+    ActionArray at:($& codePoint) put:[:s :char | s nextMulti:#(($= #'&=') ($& #'&&')) after:char].
+    ActionArray at:($^ codePoint) put:[:s :char | s nextMulti:#(($= #'^=')) after:char].
+    ActionArray at:($~ codePoint) put:[:s :char | s nextMulti:#(($= #'~=')) after:char].
+    ActionArray at:($| codePoint) put:[:s :char | s nextMulti:#(($= #'|=') ($| #'||')) after:char].
 
     "
      self setupActions