Browse Source

Merge pull request #203 from rsredsq/RED-HAXE-DEF

Added UInt where it needs in Haxe definitions. Removed duplicate
JoshEngebretson 10 years ago
parent
commit
263aa9bc91
2 changed files with 3 additions and 7 deletions
  1. 3 4
      Source/ToolCore/JSBind/JSBHaxe.cpp
  2. 0 3
      Source/ToolCore/JSBind/JSBTypeScript.cpp

+ 3 - 4
Source/ToolCore/JSBind/JSBHaxe.cpp

@@ -22,7 +22,9 @@ namespace ToolCore
             JSBPrimitiveType* ptype = ftype->type_->asPrimitiveType();
             if (ptype->kind_ == JSBPrimitiveType::Bool)
                 scriptType = "Bool";
-            if (ptype->kind_ == JSBPrimitiveType::Int)
+            if (ptype->kind_ == JSBPrimitiveType::Int && ptype->isUnsigned_)
+                scriptType = "UInt";
+            else if (ptype->kind_ == JSBPrimitiveType::Int)
                 scriptType = "Int";
             if (ptype->kind_ == JSBPrimitiveType::Float)
                 scriptType = "Float";
@@ -34,9 +36,6 @@ namespace ToolCore
         if (ftype->type_->asEnumType())
             scriptType = ftype->type_->asEnumType()->enum_->GetName();
 
-        if (ftype->type_->asEnumType())
-            scriptType = ftype->type_->asEnumType()->enum_->GetName();
-
         if (ftype->type_->asClassType())
         {
             JSBClass* klass = ftype->type_->asClassType()->class_;

+ 0 - 3
Source/ToolCore/JSBind/JSBTypeScript.cpp

@@ -34,9 +34,6 @@ String JSBTypeScript::GetScriptType(JSBFunctionType* ftype)
     if (ftype->type_->asEnumType())
         scriptType = ftype->type_->asEnumType()->enum_->GetName();
 
-    if (ftype->type_->asEnumType())
-        scriptType = ftype->type_->asEnumType()->enum_->GetName();
-
     if (ftype->type_->asClassType())
     {
         JSBClass* klass = ftype->type_->asClassType()->class_;