Răsfoiți Sursa

[jvm] optimize StringBuf.add a bit

Simon Krajewski 5 ani în urmă
părinte
comite
5833503c28
3 a modificat fișierele cu 126 adăugiri și 10 ștergeri
  1. 21 0
      src/generators/genjvm.ml
  2. 0 10
      std/java/_std/StringBuf.hx
  3. 105 0
      std/jvm/_std/StringBuf.hx

+ 21 - 0
src/generators/genjvm.ml

@@ -1464,6 +1464,27 @@ class texpr_to_jvm gctx (jc : JvmClass.builder) (jm : JvmMethod.builder) (return
 			let tl,tr = self#call_arguments cf.cf_type el in
 			jm#invokestatic c.cl_path cf.cf_name (method_sig tl tr);
 			tr
+		| TField(e1,FInstance({cl_path=(["haxe";"root"],"StringBuf");cl_descendants=[]} as c,_,({cf_name="add"} as cf))) ->
+			self#texpr rvalue_any e1;
+			let jsig = match el with
+			| [ea1] ->
+				self#texpr rvalue_any ea1;
+				begin match code#get_stack#top with
+				| TBool | TChar | TDouble | TFloat | TInt | TLong | TObject((["java";"lang"],"String"),_) as jsig ->
+					jsig
+				| TByte | TShort ->
+					jm#cast TInt;
+					TInt
+				| _ ->
+					jm#cast object_sig;
+					object_sig
+				end;
+			| _ ->
+				ignore(self#call_arguments cf.cf_type el);
+				object_sig
+			in
+			jm#invokevirtual c.cl_path "add" (method_sig [jsig] None);
+			None
 		| TField(e1,FInstance(c,tl,({cf_kind = Method (MethNormal | MethInline)} as cf))) ->
 			let is_super = match e1.eexpr with
 			| TConst TSuper ->

+ 0 - 10
std/java/_std/StringBuf.hx

@@ -33,15 +33,6 @@ class StringBuf {
 		return b.length();
 	}
 
-	#if jvm
-	public function add<T>(x:T):Void {
-		if (jvm.Jvm.instanceof(x, java.lang.Double.DoubleClass)) {
-			b.append(jvm.Jvm.toString(cast x));
-		} else {
-			b.append(x);
-		}
-	}
-	#else
 	public function add<T>(x:T):Void {
 		if (Std.isOfType(x, Int)) {
 			var x:Int = cast x;
@@ -51,7 +42,6 @@ class StringBuf {
 			b.append(x);
 		}
 	}
-	#end
 
 	public function addSub(s:String, pos:Int, ?len:Int):Void {
 		var l:Int = (len == null) ? s.length - pos : len;

+ 105 - 0
std/jvm/_std/StringBuf.hx

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C)2005-2019 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+@:coreApi
+class StringBuf {
+	private var b:java.lang.StringBuilder;
+
+	public var length(get, never):Int;
+
+	public function new():Void {
+		b = new java.lang.StringBuilder();
+	}
+
+	inline function get_length():Int {
+		return b.length();
+	}
+
+	public function add<T>(x:T):Void {
+		if (jvm.Jvm.instanceof(x, java.lang.Double.DoubleClass)) {
+			b.append(jvm.Jvm.toString(cast x));
+		} else {
+			b.append(x);
+		}
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:Bool):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:java.types.Char16):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:Float):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:Single):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:Int):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:haxe.Int64):Void {
+		b.append(v);
+	}
+
+	@:overload
+	@:native("add")
+	@:ifFeature("StringBuf.add")
+	function addOpt(v:String):Void {
+		b.append(v);
+	}
+
+	public function addSub(s:String, pos:Int, ?len:Int):Void {
+		var l:Int = (len == null) ? s.length - pos : len;
+		b.append(s, pos, pos + l);
+	}
+
+	public function addChar(c:Int):Void {
+		b.appendCodePoint(c);
+	}
+
+	public function toString():String {
+		return b.toString();
+	}
+}