paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 02:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

compiler: support MOD, DIV, SHR, SHL in preprocessor expressions

Browse Source 
git-svn-id: trunk@25469 -
This commit is contained in:
paul 2013-09-12 11:22:59 +00:00
parent cc37b19bb2
commit 974aeb5573
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/scanner.pas
View File

@ -1076,7 +1076,7 @@ type
result:=texprvalue.create_error; result:=texprvalue.create_error;
end; end;
end; end;
_EQ,_NE,_LT,_GT,_GTE,_LTE,_PLUS,_MINUS,_STAR,_SLASH: _EQ,_NE,_LT,_GT,_GTE,_LTE,_PLUS,_MINUS,_STAR,_SLASH,_OP_DIV,_OP_MOD,_OP_SHL,_OP_SHR:
if check_compatbile then if check_compatbile then
begin begin
if (is_ordinal(def) and is_ordinal(v.def)) then if (is_ordinal(def) and is_ordinal(v.def)) then
@ -1104,6 +1104,14 @@ type
result:=texprvalue.create_ord(lv*rv); result:=texprvalue.create_ord(lv*rv);
_SLASH: _SLASH:
result:=texprvalue.create_real(lv/rv); result:=texprvalue.create_real(lv/rv);
_OP_DIV:
result:=texprvalue.create_ord(lv div rv);
_OP_MOD:
result:=texprvalue.create_ord(lv mod rv);
_OP_SHL:
result:=texprvalue.create_ord(lv shl rv);
_OP_SHR:
result:=texprvalue.create_ord(lv shr rv);
end; end;
end end
else else
@ -1139,6 +1147,11 @@ type
result:=texprvalue.create_real(lvd*rvd); result:=texprvalue.create_real(lvd*rvd);
_SLASH: _SLASH:
result:=texprvalue.create_real(lvd/rvd); result:=texprvalue.create_real(lvd/rvd);
else
begin
Message(parser_e_illegal_expression);
result:=texprvalue.create_error;
end;
end; end;
end end
else else
@ -1160,7 +1173,7 @@ type
result:=texprvalue.create_bool(lvs<=rvs); result:=texprvalue.create_bool(lvs<=rvs);
_PLUS: _PLUS:
result:=texprvalue.create_str(lvs+rvs); result:=texprvalue.create_str(lvs+rvs);
_MINUS, _STAR, _SLASH: else
begin begin
Message(parser_e_illegal_expression); Message(parser_e_illegal_expression);
result:=texprvalue.create_error; result:=texprvalue.create_error;
@ -1245,7 +1258,7 @@ type
end; end;
const const
preproc_operators=[_EQ,_NE,_LT,_GT,_LTE,_GTE,_MINUS,_PLUS,_STAR,_SLASH,_OP_IN,_OP_AND,_OP_OR]; preproc_operators=[_EQ,_NE,_LT,_GT,_LTE,_GTE,_MINUS,_PLUS,_STAR,_SLASH,_OP_DIV,_OP_MOD,_OP_SHL,_OP_SHR,_OP_IN,_OP_AND,_OP_OR];
function preproc_comp_expr:texprvalue; function preproc_comp_expr:texprvalue;