Merge branch 'master' of github.com:objeck/objeck-lang

Author: objeck

src/compiler/intermediate.h

@@ -221,14 +221,20 @@ class IntermediateEmitter {
   // emits class cast checks
   void EmitClassCast(Expression* expression) {
     // class cast
-    if(expression->GetToClass()) {
+    if(expression->GetToClass() && 
+       !(expression->GetExpressionType() == METHOD_CALL_EXPR &&
+         static_cast<MethodCall*>(expression)->GetCallType() == NEW_ARRAY_CALL &&  
+         expression->GetToClass()->IsInterface())) {
       if(is_lib) {
 				imm_block->AddInstruction(IntermediateFactory::Instance()->MakeInstruction(cur_line_num, LIB_OBJ_INST_CAST, expression->GetToClass()->GetName()));
       } else {
 				imm_block->AddInstruction(IntermediateFactory::Instance()->MakeInstruction(cur_line_num, OBJ_INST_CAST, expression->GetToClass()->GetId()));
       }
     } 
-    else if(expression->GetToLibraryClass()) {
+    else if(expression->GetToLibraryClass() && 
+            !(expression->GetExpressionType() == METHOD_CALL_EXPR &&
+              static_cast<MethodCall*>(expression)->GetCallType() == NEW_ARRAY_CALL &&  
+              expression->GetToLibraryClass()->IsInterface())) {
       if(is_lib) {
 				imm_block->AddInstruction(IntermediateFactory::Instance()->MakeInstruction(cur_line_num, LIB_OBJ_INST_CAST, expression->GetToLibraryClass()->GetName()));
       } else {

src/compiler/test_src/debug.obs

@@ -1,56 +1,12 @@
-use System.IO.File;
-use System.IO;
-
-class Thingy {
-    @id : Int;
- 
-    New(id : Int) {
-      @id := id;
-    }
- 
-    method : public : Print() ~ Nil {
-      @id->PrintLine();
-    }
-  }
- 
-  class Person from Thingy {
-    @name : String;
- 
-    New(id : Int, name : String) {
-      Parent(id);
-      @name := name;
-    }
- 
-    method : public : Print() ~ Nil {
-      @id->PrintLine();
-      @name->PrintLine();
-    }
-  }
- 
-  class Serial {
+class Test {
     function : Main(args : String[]) ~ Nil {
-      t := Thingy->New(7);
-      p := Person->New(13, "Bush");
- 
-      s := Serializer->New();
-      s->Write(t->As(Base));
-      s->Write(p->As(Base));
- 
-      writer := FileWriter->New("objects.dat");
-      writer->WriteBuffer(s->Serialize());
-      writer->Close();
- 
-      buffer := FileReader->ReadBinaryFile("objects.dat");
-      d := Deserializer->New(buffer);
- 
-      t2 := d->ReadObject()->As(Thingy);
-      t2->Print();
-      p2 := d->ReadObject()->As(Person);
-      p2->Print();
+#			cc := String->New[3];
+			cc := Compare->New[3];
+			cc[0] := "fee";
+			cc[1] := "fie";
+			cc[2] := "fum";
 
-      writer := FileWriter->New("foo.txt");
-      writer->WriteBuffer(2, 3, "Καλημέρα κόσμε\r\n"->ToCharArray());
-      writer->WriteBuffer("\r\nこんにちは 世界\r\n"->ToCharArray());
-      writer->Close();
+			c := cc[1]->As(String);
+			c->PrintLine();
     }
   }