working on issue #509 #510

objeck · Feb 8, 2025 · fe8b9b7 · fe8b9b7
1 parent f47c17a
commit fe8b9b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/core/compiler/context.cpp b/core/compiler/context.cpp
@@ -2651,9 +2651,11 @@ void ContextAnalyzer::AnalyzeNewArrayCall(MethodCall* method_call, const int dep
   }
 
   // TODO: check for dimension size of 1, looking at type
-  else if(expressions.size() == 1 && expressions[0]->GetExpressionType() == VAR_EXPR && 
-          expressions[0]->GetEvalType() && expressions[0]->GetEvalType()->GetDimension() && 
-          method_call->GetEvalType()) {
+  else if(method_call->GetEvalType() && expressions.size() == 1 && (expressions[0]->GetExpressionType() == VAR_EXPR || expressions[0]->GetExpressionType() == STAT_ARY_EXPR) && expressions[0]->GetEvalType()) {
+    if(expressions[0]->GetEvalType()->GetDimension() != 1) {
+      ProcessError(static_cast<Expression*>(method_call), L"Invalid array cast dimension");
+    }
+
     Type* left_type = expressions[0]->GetEvalType();
     Type* right_type = method_call->GetEvalType();
 

diff --git a/core/compiler/intermediate.cpp b/core/compiler/intermediate.cpp
@@ -5421,7 +5421,7 @@ void IntermediateEmitter::EmitMethodCall(MethodCall* method_call, bool is_nested
   if(method_call->GetCallType() == NEW_ARRAY_CALL) {
     std::vector<Expression*> expressions = method_call->GetCallingParameters()->GetExpressions();
     // array copy constructor
-    if(expressions.size() == 1 && expressions[0]->GetExpressionType() == VAR_EXPR &&
+    if(expressions.size() == 1 && (expressions[0]->GetExpressionType() == VAR_EXPR || expressions[0]->GetExpressionType() == STAT_ARY_EXPR) &&
        expressions[0]->GetEvalType() && expressions[0]->GetEvalType()->GetDimension()) {
 
       Type* type = method_call->GetArrayType();

diff --git a/core/vm/arch/jit/jit_common.cpp b/core/vm/arch/jit/jit_common.cpp
@@ -229,7 +229,7 @@ void JitCompiler::JitStackCallback(const long instr_id, StackInstr* instr, const
           break;
 
         case 16:
-          formatter << std::hex;
+          formatter << std::hex << L"0x";
           break;
         }
 

diff --git a/core/vm/interpreter.cpp b/core/vm/interpreter.cpp
@@ -1004,7 +1004,7 @@ void StackInterpreter::Int2Str(size_t* &op_stack, long* &stack_pos)
         break;
 
       case 16:
-        formatter << std::hex;
+        formatter << std::hex << L"0x";
         break;
       }
 

diff --git a/docs/api.zip b/docs/api.zip
-Original file line number
+Diff line change
@@ Expand Up @@
               break;
             case 16:
-              formatter << std::hex;
+              formatter << std::hex << L"0x";
               break;
             }
@@ Expand Down @@