src/compiler/reia_compiler.erl @@ -3,4 +3,5 @@ -record(float, {line, value}). % Operators --record(op, {line, type, val1, val2}). \ No newline at end of file +-record(unary_op, {line, type, val}). +-record(binary_op, {line, type, val1, val2}). \ No newline at end of file src/compiler/reia_nodes.hrl @@ -39,16 +39,16 @@ expr_list -> expr eol expr_list : ['$1'|'$3']. expr -> add_expr : '$1'. -add_expr -> mult_expr add_op add_expr : {op, line('$1'), op('$2'), '$1', '$3'}. +add_expr -> mult_expr add_op add_expr : #binary_op{line=line('$1'), type=op('$2'), val1='$1', val2='$3'}. add_expr -> mult_expr : '$1'. -mult_expr -> pow_expr mult_op mult_expr : {op, line('$1'), op('$2'), '$1', '$3'}. +mult_expr -> pow_expr mult_op mult_expr : #binary_op{line=line('$1'), type=op('$2'), val1='$1', val2='$3'}. mult_expr -> pow_expr : '$1'. -pow_expr -> unary_expr pow_op pow_expr : {op, line('$1'), op('$2'), '$1', '$3'}. +pow_expr -> unary_expr pow_op pow_expr : #binary_op{line=line('$1'), type=op('$2'), val1='$1', val2='$3'}. pow_expr -> unary_expr : '$1'. -unary_expr -> unary_op unary_expr : {op, line('$1'), op('$1'), '$2'}. +unary_expr -> unary_op unary_expr : #unary_op{line=line('$1'), type=op('$1'), val='$2'}. unary_expr -> terminal_expr : '$1'. % Terminals src/compiler/reia_parse.yrl @@ -1,22 +1,21 @@ % % reia_r2e: Reia to Erlang translation layer of the compiler % Copyright (C)2009 Tony Arcieri -% +% % Redistribution is permitted under the MIT license. See LICENSE for details. % -module(reia_r2e). -export([transform/1]). -include("reia_nodes.hrl"). - + %% Numerical types -transform(Ast = {integer, _, _}) -> Ast; +transform(Exprs = #integer{}) -> Exprs; +transform(Exprs = #float{}) -> Exprs; %% Operators -transform(#op{line=Line, type=Type, val1=Val1, val2=Val2}) -> - reia_operators:transform(#op{ - line=Line, - type=Type, - val1=transform(Val1), - val2=transform(Val2) - }). \ No newline at end of file +transform(#unary_op{line=Line, type=Type, val=Val}) -> + {op, Line, Type, Val}; + +transform(#binary_op{line=Line, type=Type, val1=Val1, val2=Val2}) -> + {op, Line, Type, Val1, Val2}. \ No newline at end of file src/compiler/reia_r2e.erl @@ -27,7 +27,7 @@ string(Str, Binding) -> % Evaluate the given set of expressions exprs(Expressions, Binding) -> io:format("Input Code: ~p~n", [Expressions]), - {ok, Module} = reia_bytecode:compile(nonce_filename(), Expressions), + {ok, Module} = reia_compiler:compile(nonce_filename(), Expressions), {ok, Name, Value} = reia_bytecode:load(Module), % FIXME: In the future it's possible eval will create things which persist src/core/reia_eval.erl 8cb0e6ab8a50b40d96e90e53220e771246897784 Tony Arcieri tony@medioh.com http://github.com/tarcieri/reia/commit/8291a434ea54cfb5aa2fc5f867939904e82b3be2 8291a434ea54cfb5aa2fc5f867939904e82b3be2 2009-10-27T21:20:03-07:00 2009-10-27T21:20:03-07:00 Initial reia_compiler module, and factoring of unary and binary ops into separate nodes 6443a52e9622c578c1daba52f74e042c00f9ba9b Tony Arcieri tony@medioh.com