remove: Resolver - "this" token

change: ResolveUtils - vformat, vparse

assira/pom.xml

@@ -63,7 +63,7 @@
                                 <include>net/ranides/assira/text/LexicalCast*</include>
                                 <include>net/ranides/assira/text/StringIO*</include>
                                 <include>net/ranides/assira/text/format/**</include>
-                                <include>net/ranides/assira/text/ResolvePattern**</include>
+                                <include>net/ranides/assira/text/ResolveUtils**</include>
                                 <include>net/ranides/assira/text/ResolveFormat**</include>
                                 <include>net/ranides/assira/text/ResolveDialect**</include>
                                 

assira/src/main/java/net/ranides/assira/reflection/Resolver.java

@@ -118,9 +118,6 @@ public class Resolver implements Serializable {
     }
     
     private Object iget(Object that, String name) {
-        if("this".equals(name)) {
-            return that;
-        }
         for(Model m : MODELS) {
             if(m.matches(that)) {
                 return m.get(that, name);
@@ -149,9 +146,6 @@ public class Resolver implements Serializable {
     }
     
     private IClass itype(IClass that, String name) {
-        if("this".equals(name)) {
-            return that;
-        }
         for(Model m : MODELS) {
             if(m.matchesType(that)) {
                 return m.type(that, name);

assira/src/main/java/net/ranides/assira/text/ResolveUtils.java

@@ -22,7 +22,7 @@ public final class ResolveUtils {
         return ResolveFormat.compile(pattern).format(context);
     }
     
-    public static String format(String pattern, Object... arguments) {
+    public static String vformat(String pattern, Object... arguments) {
         return ResolveFormat.compile(pattern).format(arguments);
     }
         
@@ -30,7 +30,7 @@ public final class ResolveUtils {
         return ResolveFormat.compile(pattern).format(output, context);
     }
     
-    public static <T extends Appendable> T format(T output, String pattern, Object... arguments) throws IOException {
+    public static <T extends Appendable> T vformat(T output, String pattern, Object... arguments) throws IOException {
         return ResolveFormat.compile(pattern).format(output, arguments);
     }
     
@@ -38,7 +38,7 @@ public final class ResolveUtils {
         ResolveFormat.compile(pattern).parse(input, context);
     }
     
-    public static void parse(String pattern, String input, Object... arguments) {
+    public static void vparse(String pattern, String input, Object... arguments) {
         ResolveFormat.compile(pattern).parse(input, arguments);
     }
     

assira/src/test/java/net/ranides/assira/text/ResolveFormatTest.java

@@ -225,8 +225,8 @@ public class ResolveFormatTest {
     @Test
     public void testFormat_Pattern_Array() {
         String r1 = ResolveUtils.format("Hello {1} world {2}{3}!", new int[]{17, 19, 47, 33});
-        String r2 = ResolveUtils.format("Hello {1} world {2}{3}!", 17, 19, 47, 33);
-        String r3 = ResolveUtils.format("Hello {this} world!", 17);
+        String r2 = ResolveUtils.vformat("Hello {1} world {2}{3}!", 17, 19, 47, 33);
+        String r3 = ResolveUtils.vformat("Hello {0} world!", 17);
         assertEquals("Hello 19 world 4733!", r1);
         assertEquals("Hello 19 world 4733!", r2);
         assertEquals("Hello 17 world!", r3);