Skip to content

Resolve merge conflicts with master - #1255

Merged
mmatera merged 17 commits into
fixcomparisonsfrom
fixcomparison-rebase
Apr 11, 2021
Merged

Resolve merge conflicts with master#1255
mmatera merged 17 commits into
fixcomparisonsfrom
fixcomparison-rebase

Conversation

@rocky

Copy link
Copy Markdown
Member

No description provided.

mmateraand others added 16 commits April 8, 2021 08:35
That is, in a way that doesn't depend on OS characteristics or
specifics of how Compress compresses things.
Simplify test/helper.py and remove unused imports.
BTW: I think ToString should be the exception not the rule.
In other words the defaults to_string_expr and to_string_expected should
be opposite of what it currently is.
Handle Compress/Uncompress checks better..
Use Symbol{True,False,Null} more; lint sparse.py
It's a small thing, but that's what it is called in Mathics -
Clarify, Simplify.
same -> sameQ; do_compare -> equal2
Processing comments in Read Expression
do_comparison -> equal2
l1, l2 -> lhs, rhs
Use newer test helper and Compress/Uncompress test
@rocky
rockyforce-pushed the fixcomparison-rebase branch from 478e8e5 to 5ddf614CompareApril 11, 2021 00:07
@rockyrocky changed the title Rebase master - WIPResolve merge conflicts with masterApr 11, 2021
@rocky
rockyforce-pushed the fixcomparison-rebase branch from 19a452d to a047b46CompareApril 11, 2021 00:18
@rocky
rockyforce-pushed the fixcomparison-rebase branch from a047b46 to 32d130aCompareApril 11, 2021 00:22
@rocky
rocky requested a review from mmateraApril 11, 2021 00:36
@rocky

Copy link
Copy Markdown
MemberAuthor

@mmatera If this clears CI, this should be an equivalent to a rebase to a master with a couple more variable renamings.

There will be another branch off of this to try to modularize and simplify this code.

@mmatera
mmatera merged commit 1da8bcc into fixcomparisonsApr 11, 2021
Sign up for freeto 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.

2 participants

@rocky@mmatera