Skip to content

Commit

Permalink
Merge pull request #105 from HelgeffegleH/AutoHotkey_L
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexikos committed Aug 12, 2018
2 parents 6900030 + 03a646e commit 59ec6aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion source/defines.h
Expand Up @@ -180,7 +180,7 @@ enum SymbolType // For use with ExpandExpression() and IsNumeric().
#define IS_SHORT_CIRCUIT_OPERATOR(symbol) ((symbol) <= SYM_AND && (symbol) >= SYM_IFF_THEN) // Excludes SYM_IFF_ELSE, which acts as a simple jump after the THEN branch is evaluated.
#define SYM_USES_CIRCUIT_TOKEN(symbol) ((symbol) <= SYM_AND && (symbol) >= SYM_IFF_ELSE)
, SYM_IS, SYM_IN, SYM_CONTAINS
, SYM_EQUAL, SYM_EQUALCASE, SYM_NOTEQUAL, SYM_NOTEQUALCASE // =, ==, <> and !=, !==... Keep this in sync with IS_RELATIONAL_OPERATOR() below.
, SYM_EQUAL, SYM_EQUALCASE, SYM_NOTEQUAL, SYM_NOTEQUALCASE // =, ==, !=, !==... Keep this in sync with IS_RELATIONAL_OPERATOR() below.
, SYM_GT, SYM_LT, SYM_GTOE, SYM_LTOE // >, <, >=, <= ... Keep this in sync with IS_RELATIONAL_OPERATOR() below.
#define IS_RELATIONAL_OPERATOR(symbol) (symbol >= SYM_EQUAL && symbol <= SYM_LTOE)
, SYM_REGEXMATCH // ~=, equivalent to a RegExMatch call in two-parameter mode.
Expand Down
6 changes: 1 addition & 5 deletions source/script.cpp
Expand Up @@ -8223,7 +8223,7 @@ ResultType Line::ExpressionToPostfix(ArgStruct &aArg)
}
break;
case '!':
if (cp1 == '=') // i.e. != is synonymous with <>, which is also already supported by legacy, or !==.
if (cp1 == '=') // i.e. !=
// An additional increment for each '=' to have loop skip over the '=' too.
++cp, this_infix_item.symbol = cp[1] == '=' // note, cp[1] is not equal to cp1 here due to ++cp
? (++cp, SYM_NOTEQUALCASE) // !==
Expand Down Expand Up @@ -8344,10 +8344,6 @@ ResultType Line::ExpressionToPostfix(ArgStruct &aArg)
++cp; // An additional increment to have loop skip over the '=' too.
this_infix_item.symbol = SYM_LTOE;
break;
case '>':
++cp; // An additional increment to have loop skip over the '>' too.
this_infix_item.symbol = SYM_NOTEQUAL;
break;
case '<':
if (cp[2] == '=')
{
Expand Down

0 comments on commit 59ec6aa

Please sign in to comment.