ast: factorize `n_string` to `AStringFormExpr`

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/literal.nit b/src/literal.nit
index 5d69035..67f1120 100644 (file)
--- a/src/literal.nit
+++ b/src/literal.nit
@@ -103,16 +103,7 @@ redef class AStringFormExpr
        var value: nullable String
        redef fun accept_literal(v)
        do
-               var txt
-               if self isa AStringExpr then
-                       txt = self.n_string.text
-               else if self isa AStartStringExpr then
-                       txt = self.n_string.text
-               else if self isa AMidStringExpr then
-                       txt = self.n_string.text
-               else if self isa AEndStringExpr then
-                       txt = self.n_string.text
-               else abort
+               var txt = self.n_string.text
                self.value = txt.substring(1, txt.length-2).unescape_nit
        end
 end

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 17f8558..7f6b6b2 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -1085,22 +1085,19 @@ class ACharExpr
 end
 abstract class AStringFormExpr
        super AExpr
+    readable var _n_string: Token
 end
 class AStringExpr
        super AStringFormExpr
-    readable var _n_string: TString
 end
 class AStartStringExpr
        super AStringFormExpr
-    readable var _n_string: TStartString
 end
 class AMidStringExpr
        super AStringFormExpr
-    readable var _n_string: TMidString
 end
 class AEndStringExpr
        super AStringFormExpr
-    readable var _n_string: TEndString
 end
 class ASuperstringExpr
        super AExpr