tesses50/crosslang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got it working on Windows using Mingw

Browse Source
This commit is contained in:
Mike Nolan
2024-12-29 21:43:52 -06:00
parent 7e8ce5d58a
commit 7aae9fadba
11 changed files with 130 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vm/vm.cpp
View File

@ -919,7 +919,7 @@ namespace Tesses::CrossLang {
if(std::holds_alternative<int64_t>(left) && std::holds_alternative<int64_t>(right))
{
cse.back()->Push(gc,std::get<int64_t>(left) || std::get<int64_t>(right));
cse.back()->Push(gc,std::get<int64_t>(left) | std::get<int64_t>(right));
}
else if(std::holds_alternative<THeapObjectHolder>(left))
{
@ -928,7 +928,7 @@ namespace Tesses::CrossLang {
if(dict != nullptr)
{
gc->BarrierBegin();
TObject fn = dict->GetValue("operator||");
TObject fn = dict->GetValue("operator|");
gc->BarrierEnd();
return InvokeTwo(ls,fn,left,right);
}
@ -989,7 +989,7 @@ namespace Tesses::CrossLang {
if(std::holds_alternative<int64_t>(left) && std::holds_alternative<int64_t>(right))
{
cse.back()->Push(gc,std::get<int64_t>(left) && std::get<int64_t>(right));
cse.back()->Push(gc,std::get<int64_t>(left) & std::get<int64_t>(right));
}
else if(std::holds_alternative<THeapObjectHolder>(left))
{
@ -998,7 +998,7 @@ namespace Tesses::CrossLang {
if(dict != nullptr)
{
gc->BarrierBegin();
TObject fn = dict->GetValue("operator&&");
TObject fn = dict->GetValue("operator&");
gc->BarrierEnd();
return InvokeTwo(ls,fn,left,right);
}
@ -3597,6 +3597,7 @@ namespace Tesses::CrossLang {
break;
case RIGHTSHIFT:
TVM_HANDLER(RShift);
break;
case LESSTHAN:
TVM_HANDLER(Lt);
break;
@ -4179,19 +4180,9 @@ namespace Tesses::CrossLang {
auto dict = dynamic_cast<TDictionary*>(obj);
if(dict != nullptr)
{
gc->BarrierBegin();
auto v = dict->GetValue("ToString");
gc->BarrierEnd();
if(std::holds_alternative<THeapObjectHolder>(v))
{
auto callable=dynamic_cast<TCallable*>(std::get<THeapObjectHolder>(v).obj);
if(callable != nullptr)
{
GCList ls(gc);
auto res = callable->Call(ls,{});
return ToString(gc,res);
}
}
GCList ls(gc);
return ToString(gc,dict->CallMethod(ls,"ToString",{}));
}
}