Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Incorrect operator precedence in conditional assembly expressions #13

Merged
merged 7 commits into from
May 2, 2022
Merged

fix: Incorrect operator precedence in conditional assembly expressions #13

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce500df
test to pass
slavek-kucera Apr 28, 2022
e70eb75
passing tests
slavek-kucera Apr 29, 2022
300b41d
refactor
slavek-kucera Apr 29, 2022
80932db
more validation
slavek-kucera Apr 29, 2022
dd5cbbd
less warnings
slavek-kucera Apr 29, 2022
1bb7d71
changelog
slavek-kucera Apr 29, 2022
d20897a
fix bug + comment
slavek-kucera May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clients/vscode-hlasmplugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- Empty arrays now behave similarly to other subscripted variables in macro tracer
- Forward structured macro parameters correctly
- Empty operands ignored by the SETx instructions
- Incorrect operator precedence in conditional assembly expressions

## [1.1.0](https://github.com/eclipse/che-che4z-lsp-for-hlasm/compare/1.0.0...1.1.0) (2022-03-29)

Expand Down
4 changes: 2 additions & 2 deletions language_server/test/virtual_file_provider_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST(virtual_file_provider, predicate)

TEST(virtual_file_provider, file_missing)
{
ws_mngr_mock ws_mngr;
NiceMock<ws_mngr_mock> ws_mngr;
json_sink_mock sink;

virtual_file_provider vfp(ws_mngr, sink);
Expand Down Expand Up @@ -75,7 +75,7 @@ TEST(virtual_file_provider, file_missing)

TEST(virtual_file_provider, file_present)
{
ws_mngr_mock ws_mngr;
NiceMock<ws_mngr_mock> ws_mngr;
json_sink_mock sink;

virtual_file_provider vfp(ws_mngr, sink);
Expand Down
62 changes: 47 additions & 15 deletions parser_library/src/expressions/conditional_assembly/ca_expr_policy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ bool ca_character_policy::is_unary(ca_expr_ops op)
|| op == ca_expr_ops::UPPER;
}

bool ca_arithmetic_policy::multiple_words(ca_expr_ops) { return false; }
bool ca_binary_policy::multiple_words(ca_expr_ops op)
{
return op == ca_expr_ops::AND || op == ca_expr_ops::OR || op == ca_expr_ops::XOR;
}
bool ca_character_policy::multiple_words(ca_expr_ops) { return false; }

bool ca_arithmetic_policy::is_binary(ca_expr_ops op)
{
return op == ca_expr_ops::SLA || op == ca_expr_ops::SLL || op == ca_expr_ops::SRA || op == ca_expr_ops::SRL
Expand All @@ -44,8 +37,7 @@ bool ca_binary_policy::is_binary(ca_expr_ops op)
{
return op == ca_expr_ops::EQ || op == ca_expr_ops::NE || op == ca_expr_ops::LE || op == ca_expr_ops::LT
|| op == ca_expr_ops::GE || op == ca_expr_ops::GT || op == ca_expr_ops::AND || op == ca_expr_ops::OR
|| op == ca_expr_ops::XOR || op == ca_expr_ops::AND_NOT || op == ca_expr_ops::OR_NOT
|| op == ca_expr_ops::XOR_NOT;
|| op == ca_expr_ops::XOR;
}

bool ca_character_policy::is_binary(ca_expr_ops) { return false; }
Expand Down Expand Up @@ -156,13 +148,10 @@ int ca_binary_policy::get_priority(ca_expr_ops op)
case ca_expr_ops::NOT:
return 1;
case ca_expr_ops::AND:
case ca_expr_ops::AND_NOT:
return 2;
case ca_expr_ops::OR:
case ca_expr_ops::OR_NOT:
return 3;
case ca_expr_ops::XOR:
case ca_expr_ops::XOR_NOT:
return 4;
default:
return 0;
Expand Down Expand Up @@ -289,9 +278,6 @@ ca_expr_ops get_expr_operator(const std::string& op)
S2O(SRL);
S2O(FIND);
S2O(INDEX);
S2O(AND_NOT);
S2O(OR_NOT);
S2O(XOR_NOT);
S2O(EQ);
S2O(NE);
S2O(LE);
Expand All @@ -312,8 +298,54 @@ ca_expr_ops get_expr_operator(const std::string& op)
}

ca_expr_ops ca_arithmetic_policy::get_operator(const std::string& symbol) { return get_expr_operator(symbol); }
std::variant<std::monostate, invalid_by_policy, ca_expr_op> ca_arithmetic_policy::get_operator_properties(
const std::string& symbol)
{
auto o = get_operator(symbol);
if (o == ca_expr_ops::UNKNOWN)
return std::monostate();
bool unary = is_unary(o);
bool binary = is_binary(o);
if (!unary && !binary)
return invalid_by_policy();
Comment on lines +304 to +310
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to create a static function in ca_common_expr_policy that will do this set of checks as this part is duplicated 3 times?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the is_unary and is_binary are specialized by the individual policies, so I cannot really do it that way, but I am considering just droping all those functions in favor of one switch(-like) code...

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I see. Other option could be having a base class (e.g. ca_arithmetic_policy_base) from which the other policies could be derived.

return ca_expr_op { o, get_priority(o), binary, false, unary };
}

ca_expr_ops ca_binary_policy::get_operator(const std::string& symbol) { return get_expr_operator(symbol); }
std::variant<std::monostate, invalid_by_policy, ca_expr_op> ca_binary_policy::get_operator_properties(
const std::string& symbol)
{
auto o = get_operator(symbol);
if (o == ca_expr_ops::UNKNOWN)
return std::monostate();
bool unary = is_unary(o);
bool binary = is_binary(o);
if (!unary && !binary)
return invalid_by_policy();
return ca_expr_op {
o,
get_priority(o),
binary,
o == ca_expr_ops::EQ || o == ca_expr_ops::NE || o == ca_expr_ops::LE || o == ca_expr_ops::LT
|| o == ca_expr_ops::GE || o == ca_expr_ops::GT,
unary,
};
}

ca_expr_ops ca_character_policy::get_operator(const std::string& symbol) { return get_expr_operator(symbol); }
std::variant<std::monostate, invalid_by_policy, ca_expr_op> ca_character_policy::get_operator_properties(
const std::string& symbol)
{
auto o = get_operator(symbol);
if (o == ca_expr_ops::UNKNOWN)
return std::monostate();
bool unary = is_unary(o);
bool binary = is_binary(o);
if (!unary && !binary)
return invalid_by_policy();
return ca_expr_op { o, get_priority(o), binary, false, unary };
}


ca_expr_funcs ca_arithmetic_policy::get_function(const std::string& symbol)
{
Expand Down
35 changes: 23 additions & 12 deletions parser_library/src/expressions/conditional_assembly/ca_expr_policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef HLASMPLUGIN_PARSERLIBRARY_CA_EXPR_POLICY_H
#define HLASMPLUGIN_PARSERLIBRARY_CA_EXPR_POLICY_H

#include <variant>

#include "context/common_types.h"
#include "context/id_storage.h"

Expand All @@ -34,9 +36,6 @@ enum class ca_expr_ops
INDEX,

// logical
AND_NOT,
OR_NOT,
XOR_NOT,
EQ,
NE,
LE,
Expand All @@ -60,6 +59,18 @@ enum class ca_expr_ops
UNKNOWN
};

struct ca_expr_op
{
ca_expr_ops op;
int priority;
bool binary;
bool requires_terms;
bool right_assoc;
};

struct invalid_by_policy
{};

enum class ca_expr_funcs
{
// arithmetic
Expand Down Expand Up @@ -120,9 +131,6 @@ class ca_arithmetic_policy
// is binary arithmetic operation
static bool is_binary(ca_expr_ops op);

// true if op can consist of multiple words (eg AND NOT)
static bool multiple_words(ca_expr_ops op);

// get priority relative to rest of arithmetic operators
static int get_priority(ca_expr_ops op);

Expand All @@ -135,6 +143,9 @@ class ca_arithmetic_policy
// transforms string operator to enum
static ca_expr_ops get_operator(const std::string& symbol);

static std::variant<std::monostate, invalid_by_policy, ca_expr_op> get_operator_properties(
const std::string& symbol);

// transforms string function to enum
static ca_expr_funcs get_function(const std::string& symbol);

Expand All @@ -157,9 +168,6 @@ class ca_binary_policy
// is binary binary operation
static bool is_binary(ca_expr_ops op);

// true if op can consist of multiple words (eg AND NOT)
static bool multiple_words(ca_expr_ops op);

// get priority relative to rest of binary operators
static int get_priority(ca_expr_ops op);

Expand All @@ -172,6 +180,9 @@ class ca_binary_policy
// transforms string operator to enum
static ca_expr_ops get_operator(const std::string& symbol);

static std::variant<std::monostate, invalid_by_policy, ca_expr_op> get_operator_properties(
const std::string& symbol);

// transforms string function to enum
static ca_expr_funcs get_function(const std::string& symbol);

Expand All @@ -194,9 +205,6 @@ class ca_character_policy
// is binary character operation
static bool is_binary(ca_expr_ops op);

// true if op can consist of multiple words (eg AND NOT)
static bool multiple_words(ca_expr_ops op);

// get priority relative to rest of character operators
static int get_priority(ca_expr_ops op);

Expand All @@ -209,6 +217,9 @@ class ca_character_policy
// transforms string operator to enum
static ca_expr_ops get_operator(const std::string& symbol);

static std::variant<std::monostate, invalid_by_policy, ca_expr_op> get_operator_properties(
const std::string& symbol);

// transforms string function to enum
static ca_expr_funcs get_function(const std::string& symbol);

Expand Down
6 changes: 0 additions & 6 deletions parser_library/src/expressions/conditional_assembly/ca_operator_binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@ context::SET_t ca_function_binary_operator::operation(
return lhs.access_b() || rhs.access_b();
case ca_expr_ops::XOR:
return lhs.access_b() != rhs.access_b();
case ca_expr_ops::AND_NOT:
return lhs.access_b() && !rhs.access_b();
case ca_expr_ops::OR_NOT:
return lhs.access_b() || !rhs.access_b();
case ca_expr_ops::XOR_NOT:
return lhs.access_b() != !rhs.access_b();
default:
break;
}
Expand Down
Loading