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.

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

Expression parser support for order of operations and unary negation operator #37

Merged

Conversation

sMezaOrellana
Copy link
Contributor

@sMezaOrellana sMezaOrellana commented Jun 12, 2023

I realized that the expression parser class was not able to parse more 'complex' expressions.
Things like "4 * 1 + 1" would not equal "5". The previous expression parser did not support the order of operations.
I implemented this using a shunting yard parsing algorithm[1] for evaluating arithmetic expressions. I also added support for unary operators like '-' and '~'.
This implementation mostly follows the order of precedence defined in the C standard[2]. I added some more tests.

Fan of this project.

[1]
https://en.wikipedia.org/wiki/Shunting_yard_algorithm
[2]
https://en.cppreference.com/w/c/language/operator_precedence

@sMezaOrellana sMezaOrellana changed the title Expression parser support for order of operations, and unary operators Expression parser support for order of operations and unary negation operator Jun 12, 2023
@Schamper Schamper requested a review from pyrco June 13, 2023 01:25
@Schamper
Copy link
Member

Thanks for the amazing PR! I'm unfortunately personally out of office for another week but I've assigned @pyrco to review it. You should also receive a contributor agreement message shortly as a reply on this PR (our bot is unfortunately still a human and out of office too ;))

One quick question I already have: is it possible to support integer suffixes with your parser (#32)?

@DissectBot
Copy link

@sMezaOrellana thank you for your contribution! As this is your first code contribution, please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following information:

@DissectBot agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement ("Agreement") governs your Contribution(s) (as defined below) and conveys certain license rights to Fox-IT B.V. ("Fox-IT") for your Contribution(s) to Fox-IT"s open source Dissect project. This Agreement covers any and all Contributions that you ("You" or "Your"), now or in the future, Submit (as defined below) to this project. This Agreement is between Fox-IT B.V. and You and takes effect when you click an “I Accept” button, check box presented with these terms, otherwise accept these terms or, if earlier, when You Submit a Contribution.

  1. Definitions.
    "Contribution" means any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Fox-IT for inclusion in, or documentation of, any of the software products owned or managed by, or on behalf of, Fox-IT as part of the Project (the "Work").
    "Project" means any of the projects owned or managed by Fox-IT and offered under a license approved by the Open Source Initiative (www.opensource.org).
    "Submit" means any form of electronic, verbal, or written communication sent to Fox-IT or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Fox-IT for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."

  2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Fox-IT and to recipients of software distributed by Fox-IT a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

  3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Fox-IT and to recipients of software distributed by Fox-IT a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, maintain, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

  4. Representations. You represent that:

    • You are legally entitled to grant the above license.
    • each of Your Contributions is Your original creation (see section 8 for submissions on behalf of others).
    • Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
  5. Employer. If Your Contribution is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, You must secure permission from Your employer to make the Contribution before signing this Agreement. In that case, the term "You" in this Agreement will refer to You and the employer collectively. If You change employers in the future and desire to Submit additional Contribution for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Contributions.

  6. Support. You are not expected to provide support for Your Contribution, unless You choose to do so. Any such support provided to the Project is provided free of charge.

  7. Warranty. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

  8. Third party material. Should You wish to submit work that is not Your original creation, You may only submit it to Fox-IT separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".

  9. Notify. You agree to notify Fox-IT of any facts or circumstances of which You become aware that would make the above representations inaccurate in any respect.

  10. Governing law / competent court. This Agreement is governed by the laws of the Netherlands. Any disputes that may arise are resolved by arbitration in accordance with the Arbitration Regulations of the Foundation for the Settlement of Automation Disputes (Stichting Geschillenoplossing Automatisering – SGOA – (www.sgoa.eu), this without prejudice to either party"s right to request preliminary relief in preliminary relief proceedings or arbitral preliminary relief proceedings. Arbitration proceedings take place in Amsterdam, or in any other place designated in the Arbitration Regulations. Arbitration shall take place in English.

@sMezaOrellana
Copy link
Contributor Author

@DissectBot agree []

@sMezaOrellana
Copy link
Contributor Author

sMezaOrellana commented Jun 13, 2023

One quick question I already have: is it possible to support integer suffixes with your parser (#32)?

Yes this could be supported by slightly modifying the tokenizer. I will look at it

@sMezaOrellana
Copy link
Contributor Author

I have added support for suffixes. This means that when we encounter a number like '10ull' this gets parsed into '10'.
Suffixes are parsed according to [1] This means a number can have the following suffixes u, l, ll, ul, ull, lu, llu either in uppercase or lowercase. There are some edge cases to consider. If we look at the specifications [2]:

 std::cout << -9223372036854775808u << '\n'; // unary minus applied to unsigned
                // value subtracts it from 2^64, this evaluates as 9223372036854775808

The upper code would output 9223372036854775808 however because of how Python works we output:
-9223372036854775808
[1]
https://www.ibm.com/docs/de/zos/2.1.0?topic=literals-integer

[2]
https://en.cppreference.com/w/cpp/language/integer_literal

dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
@sMezaOrellana
Copy link
Contributor Author

Hi I see that the changes were just added. I was busy rounding up some uni work the past few weeks. Glad that this still found a place in the project.

@Schamper
Copy link
Member

Schamper commented Aug 2, 2023

Hi I see that the changes were just added. I was busy rounding up some uni work the past few weeks. Glad that this still found a place in the project.

No worries, I understand! I'd very much like this to be a part of the project so I found some free time to make my suggested changes myself.

dissect/cstruct/expression.py Outdated Show resolved Hide resolved
tests/test_expression.py Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #37 (2fff05a) into main (c254806) will increase coverage by 0.74%.
The diff coverage is 98.32%.

@@            Coverage Diff             @@
##             main      #37      +/-   ##
==========================================
+ Coverage   88.23%   88.98%   +0.74%     
==========================================
  Files          20       20              
  Lines        1709     1852     +143     
==========================================
+ Hits         1508     1648     +140     
- Misses        201      204       +3     
Flag Coverage Δ
unittests 88.98% <98.32%> (+0.74%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
dissect/cstruct/expression.py 97.28% <98.28%> (+1.72%) ⬆️
dissect/cstruct/exceptions.py 100.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

dissect/cstruct/expression.py Show resolved Hide resolved
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
tests/test_expression.py Show resolved Hide resolved
@pyrco pyrco removed their request for review August 29, 2023 07:14
dissect/cstruct/expression.py Outdated Show resolved Hide resolved
@Schamper Schamper merged commit a9374ed into fox-it:main Aug 31, 2023
10 checks passed
@Schamper
Copy link
Member

@sMezaOrellana again, huge thanks for this PR!

@sMezaOrellana sMezaOrellana deleted the feature/expression_parser_precedence_negation branch September 2, 2023 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants