Merge fortuna to master #136

Merged
gorillainduction merged 30 commits from fortuna into master 2019-03-13 18:57:29 +09:00
2 changed files with 15 additions and 16 deletions
Showing only changes of commit c0f2ac3163 - Show all commits

View File

@ -75,43 +75,43 @@ sub(Dest, Left, Right) ->
{'SUB', Dest, Left, Right}.
mul(Dest, Left, Right) ->
{'mul', Dest, Left, Right}.
{'MUL', Dest, Left, Right}.
divide(Dest, Left, Right) ->
{'div', Dest, Left, Right}.
{'DIV', Dest, Left, Right}.
modulo(Dest, Left, Right) ->
{'mod', Dest, Left, Right}.
{'MOD', Dest, Left, Right}.
pow(Dest, Left, Right) ->
{'pow', Dest, Left, Right}.
{'POW', Dest, Left, Right}.
lt(Dest, Left, Right) ->
{'lt', Dest, Left, Right}.
{'LT', Dest, Left, Right}.
gt(Dest, Left, Right) ->
{'gt', Dest, Left, Right}.
{'GT', Dest, Left, Right}.
elt(Dest, Left, Right) ->
{'elt', Dest, Left, Right}.
{'ELT', Dest, Left, Right}.
egt(Dest, Left, Right) ->
{'egt', Dest, Left, Right}.
{'EGT', Dest, Left, Right}.
eq(Dest, Left, Right) ->
{'eq', Dest, Left, Right}.
{'EQ', Dest, Left, Right}.
neq(Dest, Left, Right) ->
{'neq', Dest, Left, Right}.
{'NEQ', Dest, Left, Right}.
and_op(Dest, Left, Right) ->
{'and', Dest, Left, Right}.
{'AND', Dest, Left, Right}.
or_op(Dest, Left, Right) ->
{'or', Dest, Left, Right}.
{'OR', Dest, Left, Right}.
not_op(Dest, Arg) ->
{'not', Dest, Arg}.
{'NOT', Dest, Arg}.
tuple(Size) when is_integer(Size) ->
{'TUPLE', ?i(Size)}.

View File

@ -45,7 +45,7 @@ assemble(File, Opts) ->
undefined ->
Asm = aeb_fate_asm:read_file(File),
{Env, BC} = aeb_fate_asm:asm_to_bytecode(Asm, Opts),
case Verbose of
case Verbose of
true ->
io:format("Env: ~0p~n", [Env]);
false -> ok
@ -54,5 +54,4 @@ assemble(File, Opts) ->
OutFile ->
aeb_fate_asm:assemble_file(File, OutFile, Opts)
end.