Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
Singular Function with arguments weren't throwing exception when with less than needed arguments
  • Loading branch information
TheblueMan003 committed Jul 30, 2021
1 parent 9c505b5 commit 3da6e53
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 3 deletions.
Binary file modified .vs/BluePhoenix/v16/.suo
Binary file not shown.
4 changes: 4 additions & 0 deletions JSharp/Compiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7333,6 +7333,10 @@ public static string functionEval(string text, string[] outVar = null, string op
}
else if (a.defValue != null)
output += parseLine(a.gameName + "=" + a.defValue);
else
{
throw new Exception("Not Enought argument for " + funObj.gameName + "(" + arg + ")");
}
}
}
}
Expand Down
Binary file modified JSharp/bin/Debug/BluePhoenix.exe
Binary file not shown.
Binary file modified JSharp/bin/Debug/BluePhoenix.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions JSharp/bin/Debug/formating.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<style name="s_4" color="#4A9CC7" />
<rule style="s_4" options="Singleline,IgnoreCase">(?i)(\bint\.|\bdata\.|\bstring\.|\bobject\.|\bdefault\.)</rule>
<style name="s_5" color="#7CDCF0" />
<rule style="s_5" options="Singleline,IgnoreCase">(?i)(\bobject\.area_cloud_initer\b|\bobject\.armor_stand_initer\b|\bobject\.default_initer\b)</rule>
<rule style="s_5" options="Singleline,IgnoreCase">(?i)(\bobject\.area_cloud_initer\b|\bobject\.armor_stand_initer\b|\bobject\.default_initer\b|\bdefault\.test\b)</rule>
<style name="s_6" color="#44C9A2" fontStyle="Bold" />
<rule style="s_6" options="Singleline,IgnoreCase">(?i)(\bobject\b|\bdefault\.object\b|\bobject_armor_stand\b|\bdefault\.object_armor_stand\b|\btest\b|\bdefault\.test\b|\bdefault\.default\.test\b)</rule>
<rule style="s_6" options="Singleline,IgnoreCase">(?i)(\bobject\b|\bdefault\.object\b|\bobject_armor_stand\b|\bdefault\.object_armor_stand\b)</rule>
<style name="s_7" color="#FF00FF" />
<rule style="s_7" options="Singleline,IgnoreCase">(-?\b)(\d+\.\d+|\d+)[bldsf]?\b</rule>
<style name="s_8" color="#FFFFC8" />
Expand Down
2 changes: 1 addition & 1 deletion JSharp/bin/Debug/project.old
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
E:\017_TBMScript\037_Mapjam3\project.tbms
E:\017_TBMScript\023_Datapacks\028_AnimTest\project.tbms
E:\017_TBMScript\025_Parkour_Tower\project.tbms
E:\017_TBMScript\034_Blockception_Parkour_5\project.tbms
Expand All @@ -10,7 +11,6 @@ F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_17\animation\npc.tbms
F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_16_5\resourcespack\font.tbms
F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_16_5\resourcespack\sounds.tbms
F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_16_5\resourcespack\models.tbms
E:\017_TBMScript\037_Mapjam3\project.tbms
F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_17\inventory.tbms
E:\017_TBMScript\023_Datapacks\025_Reginald\project.tbms
F:\002_Software_dev\JSharp\JSharp\bin\Debug\lib\1_16_5\cmd\music.tbms
Expand Down
Binary file modified JSharp/obj/Debug/BluePhoenix.csproj.AssemblyReference.cache
Binary file not shown.
Binary file modified JSharp/obj/Debug/BluePhoenix.exe
Binary file not shown.
Binary file modified JSharp/obj/Debug/BluePhoenix.pdb
Binary file not shown.

0 comments on commit 3da6e53

Please sign in to comment.