Skip to content

Fixed parseFile() skipping every other line#1223

Merged
dschuff merged 2 commits intoWebAssembly:masterfrom
Lichtso:master
Oct 16, 2017
Merged

Fixed parseFile() skipping every other line#1223
dschuff merged 2 commits intoWebAssembly:masterfrom
Lichtso:master

Conversation

@Lichtso
Copy link
Copy Markdown
Contributor

@Lichtso Lichtso commented Oct 15, 2017

.s files beginning like this:

.text
.file	"main.c"
.file	1 "stdio.h"
.file	2 "stdlib.h"
.file	3 "string.h"

are now parsed correctly.

@Lichtso
Fixed parseFile() skipping every other line
1bc328d 
Was caused by "s = strchr(s, '\n')"
Also replaced recordFile() by parseFile() as they do exactly the same
@Lichtso
Added parseFile() to process() in s2wasm.h
3b80f98
dschuff
dschuff approved these changes Oct 16, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@dschuff dschuff left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@dschuff dschuff merged commit faaa20b into WebAssembly:master Oct 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dschuff dschuff dschuff approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Lichtso @dschuff