Skip to content

[trivial] Match MemorySet enum style to code from before autoconversion #5405

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

Merged
9rnsr merged 1 commit into from
Feb 5, 2016
Merged

[trivial] Match MemorySet enum style to code from before autoconversion #5405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/e2ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2520,7 +2520,7 @@ elem *toElem(Expression *e, IRState *irs)
Type *ta = are->e1->type->toBasetype();

// which we do if the 'next' types match
if (ae->memset & MemorySet_blockAssign)
if (ae->memset & blockAssign)
{
// Do a memset for array[]=v
//printf("Lpair %s\n", ae->toChars());
Expand Down Expand Up @@ -2710,7 +2710,7 @@ elem *toElem(Expression *e, IRState *irs)

/* Look for reference initializations
*/
if (ae->memset & MemorySet_referenceInit)
if (ae->memset & referenceInit)
{
assert(ae->op == TOKconstruct || ae->op == TOKblit);
assert(ae->e1->op == TOKvar);
Expand Down
4 changes: 2 additions & 2 deletions src/expression.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,8 +1170,8 @@ class PreExp : public UnaExp

enum MemorySet
{
MemorySet_blockAssign = 1, // setting the contents of an array
MemorySet_referenceInit = 2, // setting the reference of STCref variable
blockAssign = 1, // setting the contents of an array
referenceInit = 2, // setting the reference of STCref variable
};

class AssignExp : public BinExp
Expand Down