gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refer to "end of line", not "newline" (#1517)

Browse Source
This commit is contained in:
Sylvie
2024-09-22 20:15:02 -04:00
committed by GitHub
parent 6b89938da7
commit 22767e36e2
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/asm/parser.y
View File

@@ -103,7 +103,7 @@
/******************** Tokens ********************/ /******************** Tokens ********************/
%token YYEOF 0 "end of file" %token YYEOF 0 "end of file"
%token NEWLINE "newline" %token NEWLINE "end of line"
%token EOB "end of buffer" %token EOB "end of buffer"
// General punctuation // General punctuation

2
src/link/script.y
View File

@@ -55,7 +55,7 @@
/******************** Tokens and data types ********************/ /******************** Tokens and data types ********************/
%token YYEOF 0 "end of file" %token YYEOF 0 "end of file"
%token newline %token newline "end of line"
%token COMMA "," %token COMMA ","
%token ORG "ORG" %token ORG "ORG"
FLOATING "FLOATING" FLOATING "FLOATING"

2
test/asm/charmap-empty.err
View File

@@ -1,5 +1,5 @@
error: charmap-empty.asm(1): error: charmap-empty.asm(1):
Cannot map an empty string Cannot map an empty string
error: charmap-empty.asm(2): error: charmap-empty.asm(2):
syntax error, unexpected newline syntax error, unexpected end of line
error: Assembly aborted (2 errors)! error: Assembly aborted (2 errors)!

12
test/asm/code-after-endm-endr-endc.err
View File

@@ -1,15 +1,15 @@
error: code-after-endm-endr-endc.asm(6): error: code-after-endm-endr-endc.asm(6):
syntax error, unexpected PRINTLN, expecting newline or end of buffer syntax error, unexpected PRINTLN, expecting end of line or end of buffer
error: code-after-endm-endr-endc.asm(7): error: code-after-endm-endr-endc.asm(7):
Macro "mac" not defined Macro "mac" not defined
error: code-after-endm-endr-endc.asm(12): error: code-after-endm-endr-endc.asm(12):
syntax error, unexpected PRINTLN, expecting newline or end of buffer syntax error, unexpected PRINTLN, expecting end of line or end of buffer
error: code-after-endm-endr-endc.asm(17): error: code-after-endm-endr-endc.asm(17):
syntax error, unexpected PRINTLN, expecting newline syntax error, unexpected PRINTLN, expecting end of line
error: code-after-endm-endr-endc.asm(19): error: code-after-endm-endr-endc.asm(19):
syntax error, unexpected PRINTLN, expecting newline or end of buffer syntax error, unexpected PRINTLN, expecting end of line or end of buffer
error: code-after-endm-endr-endc.asm(23): error: code-after-endm-endr-endc.asm(23):
syntax error, unexpected PRINTLN, expecting newline syntax error, unexpected PRINTLN, expecting end of line
error: code-after-endm-endr-endc.asm(25): error: code-after-endm-endr-endc.asm(25):
syntax error, unexpected PRINTLN, expecting newline or end of buffer syntax error, unexpected PRINTLN, expecting end of line or end of buffer
error: Assembly aborted (7 errors)! error: Assembly aborted (7 errors)!

2
test/asm/invalid-opt.err
View File

@@ -17,7 +17,7 @@ error: invalid-opt.asm(8):
error: invalid-opt.asm(9): error: invalid-opt.asm(9):
Must specify an argument for option 'W' Must specify an argument for option 'W'
error: invalid-opt.asm(10): error: invalid-opt.asm(10):
syntax error, unexpected newline, expecting string syntax error, unexpected end of line, expecting string
error: invalid-opt.asm(11): error: invalid-opt.asm(11):
No entries in the option stack No entries in the option stack
error: Assembly aborted (11 errors)! error: Assembly aborted (11 errors)!

2
test/asm/syntax-error-after-syntax-error.err
View File

@@ -7,5 +7,5 @@ error: syntax-error-after-syntax-error.asm(6):
error: syntax-error-after-syntax-error.asm(9): error: syntax-error-after-syntax-error.asm(9):
syntax error, unexpected : syntax error, unexpected :
error: syntax-error-after-syntax-error.asm(10): error: syntax-error-after-syntax-error.asm(10):
syntax error, unexpected stop, expecting newline or end of buffer or :: syntax error, unexpected stop, expecting end of line or end of buffer or ::
error: Assembly aborted (5 errors)! error: Assembly aborted (5 errors)!

2
test/asm/syntax-error-eof-newline.err
View File

@@ -1,3 +1,3 @@
error: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1): error: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1):
syntax error, unexpected newline syntax error, unexpected end of line
error: Assembly aborted (1 error)! error: Assembly aborted (1 error)!

4
test/link/script-syntax-error.out
View File

@@ -1,3 +1,3 @@
error: script-syntax-error.link(2): syntax error, unexpected ORG, expecting newline or OPTIONAL error: script-syntax-error.link(2): syntax error, unexpected ORG, expecting end of line or OPTIONAL
error: script-syntax-error.link(5): syntax error, unexpected string, expecting newline or FLOATING or number error: script-syntax-error.link(5): syntax error, unexpected string, expecting end of line or FLOATING or number
Linking failed with 2 errors Linking failed with 2 errors