Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed some minor error for haxe3.1.1 #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed some minor error for haxe3.1.1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4dae5
fixed wrong package name introduced by haxe 3.1.1
Apr 11, 2014
96f4443
add default for case to supress error
davyzhang Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions haxelib-release/com/dongxiguo/protobuf/compiler/BinaryFormat.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions haxelib-release/com/dongxiguo/protobuf/compiler/Extension.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions haxelib-release/com/dongxiguo/protobuf/compiler/ProtoData.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -727,6 +727,7 @@ private typedef ProtobufError = com.dongxiguo.protobuf.Error;
constructorBlock.push(macro this.$haxeFieldName = []);
}
}
default:
}
}
if (!readonly)
Expand Down