X-Git-Url: http://nitlanguage.org

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index d0325cc..5f4c2dc 100644
--- a/src/semantize/typing.nit
+++ b/src/semantize/typing.nit
@@ -1135,6 +1135,7 @@ redef class ADoExpr
 	redef fun accept_typing(v)
 	do
 		v.visit_stmt(n_block)
+		v.visit_stmt(n_catch)
 		self.is_typed = true
 	end
 end
@@ -1473,21 +1474,59 @@ redef class ACharExpr
 	end
 end
 
-redef class AStringFormExpr
-	redef fun accept_typing(v)
-	do
+redef class AugmentedStringFormExpr
+	super AExpr
+
+	# Text::to_re, used for prefix `re`
+	var to_re: nullable CallSite = null
+	# Regex::ignore_case, used for suffix `i` on `re`
+	var ignore_case: nullable CallSite = null
+	# Regex::newline, used for suffix `m` on `re`
+	var newline: nullable CallSite = null
+	# Regex::extended, used for suffix `b` on `re`
+	var extended: nullable CallSite = null
+	# NativeString::to_bytes_with_copy, used for prefix `b`
+	var to_bytes_with_copy: nullable CallSite = null
+
+	redef fun accept_typing(v) do
 		var mclass = v.get_mclass(self, "String")
 		if mclass == null then return # Forward error
-		self.mtype = mclass.mclass_type
+		if is_bytestring then
+			to_bytes_with_copy = v.get_method(self, v.mmodule.native_string_type, "to_bytes_with_copy", false)
+			mclass = v.get_mclass(self, "Bytes")
+		else if is_re then
+			to_re = v.get_method(self, mclass.mclass_type, "to_re", false)
+			for i in suffix.chars do
+				mclass = v.get_mclass(self, "Regex")
+				if mclass == null then
+					v.error(self, "Error: `Regex` class unknown")
+					return
+				end
+				var service = ""
+				if i == 'i' then
+					service = "ignore_case="
+					ignore_case = v.get_method(self, mclass.mclass_type, service, false)
+				else if i == 'm' then
+					service = "newline="
+					newline = v.get_method(self, mclass.mclass_type, service, false)
+				else if i == 'b' then
+					service = "extended="
+					extended = v.get_method(self, mclass.mclass_type, service, false)
+				else
+					v.error(self, "Type Error: Unrecognized suffix {i} in prefixed Regex")
+					abort
+				end
+			end
+		end
+		if mclass == null then return # Forward error
+		mtype = mclass.mclass_type
 	end
 end
 
 redef class ASuperstringExpr
 	redef fun accept_typing(v)
 	do
-		var mclass = v.get_mclass(self, "String")
-		if mclass == null then return # Forward error
-		self.mtype = mclass.mclass_type
+		super
 		var objclass = v.get_mclass(self, "Object")
 		if objclass == null then return # Forward error
 		var objtype = objclass.mclass_type