From ee4dae56ffff031afcb6850db00275ce80b2ea32 Mon Sep 17 00:00:00 2001 From: davyzhang Date: Fri, 11 Apr 2014 14:50:12 +0800 Subject: [PATCH 1/2] fixed wrong package name introduced by haxe 3.1.1 --- .../com/dongxiguo/protobuf/compiler/BinaryFormat.hx | 6 +++--- .../com/dongxiguo/protobuf/compiler/Extension.hx | 6 +++--- .../com/dongxiguo/protobuf/compiler/ProtoData.hx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/haxelib-release/com/dongxiguo/protobuf/compiler/BinaryFormat.hx b/haxelib-release/com/dongxiguo/protobuf/compiler/BinaryFormat.hx index a7130f0..dcd28db 100644 --- a/haxelib-release/com/dongxiguo/protobuf/compiler/BinaryFormat.hx +++ b/haxelib-release/com/dongxiguo/protobuf/compiler/BinaryFormat.hx @@ -42,7 +42,7 @@ import haxe.macro.Expr; #if neko import haxe.macro.Context; #end -import haxe.macro.ExprTools; +import haxe.macro.MacroStringTools; import haxe.PosInfos; #if haxe3 @@ -194,7 +194,7 @@ class BinaryFormat var nestedMergerPackage = mergerNameConverter.getHaxePackage(resolvedFieldTypeName); var nestedMergerPackageExpr = - ExprTools.toFieldExpr(nestedMergerPackage); + MacroStringTools.toFieldExpr(nestedMergerPackage); var nestedMergerName = mergerNameConverter.getHaxeClassName(resolvedFieldTypeName); var newFieldBuilderExpr = @@ -585,7 +585,7 @@ class BinaryFormat var nestedWriterPackage = writerNameConverter.getHaxePackage(resolvedFieldTypeName); var nestedWriterPackageExpr = - ExprTools.toFieldExpr(nestedWriterPackage); + MacroStringTools.toFieldExpr(nestedWriterPackage); var nestedWriterName = writerNameConverter.getHaxeClassName(resolvedFieldTypeName); macro diff --git a/haxelib-release/com/dongxiguo/protobuf/compiler/Extension.hx b/haxelib-release/com/dongxiguo/protobuf/compiler/Extension.hx index 00e112b..ddcfd64 100644 --- a/haxelib-release/com/dongxiguo/protobuf/compiler/Extension.hx +++ b/haxelib-release/com/dongxiguo/protobuf/compiler/Extension.hx @@ -34,7 +34,7 @@ import com.dongxiguo.protobuf.compiler.bootstrap.google.protobuf.fieldDescriptor import com.dongxiguo.protobuf.WireType; import haxe.macro.Context; import haxe.macro.Expr; -import haxe.macro.ExprTools; +import haxe.macro.MacroStringTools; import haxe.PosInfos; using Lambda; @@ -100,7 +100,7 @@ class Extension var nestedWriterPackage = writerNameConverter.getHaxePackage(resolvedFieldTypeName); var nestedWriterPackageExpr = - ExprTools.toFieldExpr(nestedWriterPackage); + MacroStringTools.toFieldExpr(nestedWriterPackage); var nestedWriterName = writerNameConverter.getHaxeClassName(resolvedFieldTypeName); var nestedWriterExpr = packageDotClass(nestedWriterPackageExpr, nestedWriterName); @@ -526,7 +526,7 @@ class Extension var nestedMergerPackage = mergerNameConverter.getHaxePackage(resolvedFieldTypeName); var nestedMergerPackageExpr = - ExprTools.toFieldExpr(nestedMergerPackage); + MacroStringTools.toFieldExpr(nestedMergerPackage); var nestedMergerName = mergerNameConverter.getHaxeClassName(resolvedFieldTypeName); var nestedMergerClassExpr = packageDotClass(nestedMergerPackageExpr, nestedMergerName); diff --git a/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx b/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx index e57f3b6..8690590 100644 --- a/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx +++ b/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx @@ -41,7 +41,7 @@ import haxe.io.BytesOutput; import haxe.macro.Expr; import haxe.Int64; import haxe.macro.Context; -import haxe.macro.ExprTools; +import haxe.macro.MacroStringTools; import haxe.PosInfos; using StringTools; #if haxe3 @@ -219,7 +219,7 @@ private typedef ProtobufError = com.dongxiguo.protobuf.Error; var haxeNameParts = nameConverter.getHaxePackage(field.typeName); haxeNameParts.push(nameConverter.getHaxeEnumName(field.typeName)); haxeNameParts.push(nameConverter.toHaxeEnumConstructorName(field.defaultValue)); - return ExprTools.toFieldExpr(haxeNameParts); + return MacroStringTools.toFieldExpr(haxeNameParts); } case ProtobufType.TYPE_INT64, ProtobufType.TYPE_UINT64, ProtobufType.TYPE_FIXED64, ProtobufType.TYPE_SFIXED64, ProtobufType.TYPE_SINT64: { From 96f4443f1f2b24eed107c43e9aed4bd05e5ac0f9 Mon Sep 17 00:00:00 2001 From: davyzhang Date: Fri, 11 Apr 2014 15:15:04 +0800 Subject: [PATCH 2/2] add default for case to supress error --- haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx b/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx index 8690590..363ac50 100644 --- a/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx +++ b/haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx @@ -727,6 +727,7 @@ private typedef ProtobufError = com.dongxiguo.protobuf.Error; constructorBlock.push(macro this.$haxeFieldName = []); } } + default: } } if (!readonly)