Skip to content

Fix build failures on macOS/clang #10

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

Open
vmalepati1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build failures on macOS/clang #10

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
24 changes: 13 additions & 11 deletions c++/sequitur_simple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ class rules {

class symbols {
symbols *n, *p;
ulong s;
unsigned long s;

public:

// initializes a new symbol. If it is non-terminal, increments the reference
// count of the corresponding rule

symbols(ulong sym) {
symbols(unsigned long sym) {
s = sym * 2 + 1;
// an odd number, so that they're distinct from the rule pointers, which
// we assume are 4-byte aligned
p = n = 0;
}

symbols(rules *r) {
s = (ulong) r;
s = (unsigned long) r;
p = n = 0;
rule()->reuse();
}
Expand Down Expand Up @@ -132,8 +132,8 @@ class symbols {

symbols *next() { return n;};
symbols *prev() { return p;};
inline ulong raw_value() { return s; };
inline ulong value() { return s / 2;};
inline unsigned long raw_value() { return s; };
inline unsigned long value() { return s / 2;};

// assuming this is a non-terminal, rule() returns the corresponding rule

Expand All @@ -148,12 +148,12 @@ class symbols {
int check() {
if (is_guard() || n->is_guard()) return 0;
symbols **x = find_digram(this);
if (ulong(*x) <= 1) {
if ((unsigned long)(*x) <= 1) {
*x = this;
return 0;
}

if (ulong(*x) > 1 && (*x)->next() != this) match(this, *x);
if ((unsigned long)(*x) > 1 && (*x)->next() != this) match(this, *x);
return 1;
}

Expand All @@ -164,7 +164,7 @@ class symbols {

rules S;

main()
int main()
{
S.last()->insert_after(new symbols(cin.get()));
int x = 0;
Expand All @@ -177,6 +177,8 @@ main()

void print();
print();

return 0;
}

int num_rules = 0;
Expand Down Expand Up @@ -282,8 +284,8 @@ symbols *table[PRIME];

symbols **find_digram(symbols *s)
{
ulong one = s->raw_value();
ulong two = s->next()->raw_value();
unsigned long one = s->raw_value();
unsigned long two = s->next()->raw_value();

int jump = HASH2(one);
int insert = -1;
Expand All @@ -295,7 +297,7 @@ symbols **find_digram(symbols *s)
if (insert == -1) insert = i;
return &table[insert];
}
else if (ulong(m) == 1) insert = i;
else if ((unsigned long)(m) == 1) insert = i;
else if (m->raw_value() == one && m->next()->raw_value() == two)
return &table[i];
i = (i + jump) % PRIME;
Expand Down