Skip to content
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

Jump to bottom

Fix Windows Line Number #401

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix Windows Line Number #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
720a918
Add soup build recipe
Dec 23, 2022
cd1573c
Revert "Add soup build recipe"
Dec 27, 2022
3d7ce27
Update to VS2022 Toolset
Dec 27, 2022
b0ce235
Fix peek to use next instead of current
Dec 27, 2022
c1ca0d1
Add windows test run_all script
Dec 27, 2022
b4b151b
Pass in next and next2 to the in_newline check
Dec 27, 2022
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
8 changes: 4 additions & 4 deletions gravity_visualstudio/gravity.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions gravity_visualstudio/gravity_cli.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions gravity_visualstudio/gravity_dll.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
Expand Down
25 changes: 14 additions & 11 deletions src/compiler/gravity_lexer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,30 +73,33 @@ static inline bool is_whitespace (int c) {
return ((c == ' ') || (c == '\t') || (c == '\v') || (c == '\f'));
}

static inline bool is_newline (gravity_lexer_t *lexer, int c) {
static inline bool is_newline (gravity_lexer_t *lexer, int c, int n, int n2) {
// CR: Carriage Return, U+000D (UTF-8 in hex: 0D)
// LF: Line Feed, U+000A (UTF-8 in hex: 0A)
// CR+LF: CR (U+000D) followed by LF (U+000A) (UTF-8 in hex: 0D0A)

// LF
if (c == 0x0A) return true;
if (c == 0x0A)
return true;

// CR+LF or CR
if (c == 0x0D) {
if (PEEK_CURRENT == 0x0A) {NEXT;}
if (n == 0x0A) {
NEXT;
}
return true;
}

// UTF-8 cases https://en.wikipedia.org/wiki/Newline#Unicode

// NEL: Next Line, U+0085 (UTF-8 in hex: C285)
if ((c == 0xC2) && (PEEK_CURRENT == 0x85)) {
if ((c == 0xC2) && (n == 0x85)) {
NEXT;
return true;
}

// LS: Line Separator, U+2028 (UTF-8 in hex: E280A8)
if ((c == 0xE2) && (PEEK_CURRENT == 0x80) && (PEEK_NEXT == 0xA8)) {
if ((c == 0xE2) && (n == 0x80) && (n2 == 0xA8)) {
NEXT; NEXT;
return true;
}
Expand Down Expand Up @@ -210,13 +213,13 @@ static gtoken_t lexer_scan_comment(gravity_lexer_t *lexer) {
next_utf8(lexer, &c);

if (isLineComment){
if (is_newline(lexer, c)) {INC_LINE; break;}
if (is_newline(lexer, c, PEEK_CURRENT, PEEK_NEXT)) {INC_LINE; break;}
} else {
if (IS_EOF) break;
int c2 = PEEK_CURRENT;
if ((c == '/') && (c2 == '*')) ++count;
if ((c == '*') && (c2 == '/')) {--count; NEXT; INC_TOKLEN; if (count == 0) break;}
if (is_newline(lexer, c)) {INC_LINE;}
if (is_newline(lexer, c, c2, PEEK_NEXT)) {INC_LINE;}
}
}

Expand Down Expand Up @@ -304,7 +307,7 @@ static gtoken_t lexer_scan_number(gravity_lexer_t *lexer) {
if (IS_EOF) goto report_token;
if (is_digit(c, ntype)) goto accept_char;
if (is_whitespace(c)) goto report_token;
if (is_newline(lexer, c)) goto report_token;
if (is_newline(lexer, c, PEEK_NEXT, PEEK_NEXT2)) goto report_token;

if (expAllowed) {
if ((c == expChar) && (!expFound)) {expFound = true; signAllowed = true; goto accept_char;}
Expand Down Expand Up @@ -347,7 +350,7 @@ static gtoken_t lexer_scan_string(gravity_lexer_t *lexer) {

while ((c2 = (unsigned char)PEEK_CURRENT) != c) {
if (IS_EOF) return lexer_error(lexer, "Unexpected EOF inside a string literal");
if (is_newline(lexer, c2)) INC_LINE;
if (is_newline(lexer, c2, PEEK_NEXT, PEEK_NEXT2)) INC_LINE;

// handle escaped characters
if (c2 == '\\') {
Expand Down Expand Up @@ -576,7 +579,7 @@ gtoken_t gravity_lexer_next (gravity_lexer_t *lexer) {
c = PEEK_CURRENT;

if (is_whitespace(c)) {INC_OFFSET_POSITION; goto loop;}
if (is_newline(lexer, c)) {INC_OFFSET_POSITION; INC_LINE; goto loop;}
if (is_newline(lexer, c, PEEK_NEXT, PEEK_NEXT2)) {INC_OFFSET_POSITION; INC_LINE; goto loop;}
if (is_comment(c, PEEK_NEXT)) {lexer_scan_comment(lexer); goto loop;}

if (is_semicolon(c)) {token = lexer_scan_semicolon(lexer); goto return_result;}
Expand Down Expand Up @@ -619,7 +622,7 @@ void gravity_lexer_skip_line (gravity_lexer_t *lexer) {
while (!IS_EOF) {
int c = 0;
next_utf8(lexer, &c);
if (is_newline(lexer, c)) {
if (is_newline(lexer, c, PEEK_CURRENT, PEEK_NEXT)) {
INC_LINE;
break;
}
Expand Down
38 changes: 38 additions & 0 deletions test/unittest/run_all.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@echo off
setlocal ENABLEDELAYEDEXPANSION

@REM This script is intended to be used either by the CI or by a developer that
@REM wants to check that no unit tests have been broken to ensure there are no
@REM regressions. At the end, it reports how many tests were successful.

set SCRIPT_DIR=%~dp0
set GRAVITY_BIN=%SCRIPT_DIR%/../../gravity_visualstudio/bin/cli/x64/Debug/gravity.exe
set /a tests_total=0
set /a tests_success=0
set /a tests_fail=0
set /a tests_timeout=0
Copy link
Author

Choose a reason for hiding this comment

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

I am unsure what the best replacement is for timeout, so I removed the timout checks for now.

set /a i=1

for /f %%A in ('dir /s %SCRIPT_DIR%\*.gravity ^| find "File(s)"') do set tests_total=%%A

for /f "delims=" %%A in ('dir /s /b %SCRIPT_DIR%\*.gravity') do (
set test=%%A
echo "Testing !i!/%tests_total% - !test!..."
"%GRAVITY_BIN%" "!test!"
set res=!ERRORLEVEL!
if !res! EQU 0 (
set /a tests_success+=1
echo "Success!"
) else (
echo "Fail!"
set /a tests_fail+=1
)
set /a i+=1
)

echo "Tests run successfully: %tests_success%/%tests_total%. %tests_fail% failed and %tests_timeout% timed out"

set /a tests_non_success=%tests_fail%+%tests_timeout%
if %tests_non_success% NEQ 0 (
exit 1
)