nitg: extract toolchain methods into a new ToolChain class

[nit.git] / src / literal.nit

diff --git a/src/literal.nit b/src/literal.nit
index 0e08350..9daefcb 100644 (file)
--- a/src/literal.nit
+++ b/src/literal.nit
@@ -20,10 +20,9 @@ module literal
 import parser
 import toolcontext
 import phase
-import serialization_phase
 
 redef class ToolContext
-       var literal_phase: Phase = new LiteralPhase(self, [serialization_phase])
+       var literal_phase: Phase = new LiteralPhase(self, null)
 end
 
 private class LiteralPhase
@@ -91,7 +90,7 @@ redef class ACharExpr
                        v.toolcontext.error(self.hot_location, "Invalid character literal {txt}")
                        return
                end
-               self.value = txt[1]
+               self.value = txt.chars[1]
        end
 end
 
@@ -102,7 +101,7 @@ redef class AStringFormExpr
        do
                var txt = self.n_string.text
                var skip = 1
-               if txt[0] == txt[1] and txt.length >= 6 then skip = 3
+               if txt.chars[0] == txt.chars[1] and txt.length >= 6 then skip = 3
                self.value = txt.substring(skip, txt.length-(2*skip)).unescape_nit
        end
 end