From b55f50e4e5ee877f3301217f1d14690a29bf0d2c Mon Sep 17 00:00:00 2001 From: Wang Renxin Date: Thu, 9 Apr 2020 17:12:22 +0800 Subject: [PATCH] *improved incomplete IF structure error prompting. --- HISTORY | 3 +++ LICENSE | 2 +- README.md | 2 +- core/my_basic.c | 6 ++++-- core/my_basic.h | 2 +- donate.html | 4 ++-- resource/my_basic.rc | 2 +- shell/main.c | 4 ++-- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/HISTORY b/HISTORY index e3793ee..2f582c9 100755 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,6 @@ +Apr. 9 2020 +Improved incomplete IF structure error prompting + Mar. 16 2019 Fixed a memory leak when reassigning an array element with string, thanks to Jacques Diederik for pointing it out diff --git a/LICENSE b/LICENSE index 0e307bb..d87c640 100755 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (C) 2011 - 2019 Wang Renxin +Copyright (C) 2011 - 2020 Wang Renxin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index d869066..b59b74a 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ |_|_|_| |_| |_____|__|__|_____|_____|_____| ~~~~~~~~~~ -**Copyright (C) 2011 - 2019 Wang Renxin** +**Copyright (C) 2011 - 2020 Wang Renxin** [![Build status](https://travis-ci.org/paladin-t/my_basic.svg?branch=master)](https://travis-ci.org/paladin-t/my_basic) [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT) diff --git a/core/my_basic.c b/core/my_basic.c index 66b33b0..18dd08d 100755 --- a/core/my_basic.c +++ b/core/my_basic.c @@ -3,7 +3,7 @@ ** ** For the latest info, see https://github.com/paladin-t/my_basic/ ** -** Copyright (C) 2011 - 2019 Wang Renxin +** Copyright (C) 2011 - 2020 Wang Renxin ** ** Permission is hereby granted, free of charge, to any person obtaining a copy of ** this software and associated documentation files (the "Software"), to deal in @@ -15807,7 +15807,9 @@ _elseif: if(ast && ast->next && _IS_EOS(ast->next->data)) { multi_line = true; - _skip_if_chunk(s, &ast); + result = _skip_if_chunk(s, &ast); + if(result != MB_FUNC_OK) + goto _exit; } if(multi_line && ast && _IS_FUNC(ast->data, _core_elseif)) { ast = ast->next; diff --git a/core/my_basic.h b/core/my_basic.h index 9c32cf3..ff74ec6 100755 --- a/core/my_basic.h +++ b/core/my_basic.h @@ -3,7 +3,7 @@ ** ** For the latest info, see https://github.com/paladin-t/my_basic/ ** -** Copyright (C) 2011 - 2019 Wang Renxin +** Copyright (C) 2011 - 2020 Wang Renxin ** ** Permission is hereby granted, free of charge, to any person obtaining a copy of ** this software and associated documentation files (the "Software"), to deal in diff --git a/donate.html b/donate.html index 41a0c5f..6144dd7 100644 --- a/donate.html +++ b/donate.html @@ -1,6 +1,6 @@ @@ -115,6 +115,6 @@ LIST OF DONORS. BACK TO MY-BASIC

-

Copyright (C) 2011 - 2019 Wang Renxin. All rights reserved.

+

Copyright (C) 2011 - 2020 Wang Renxin. All rights reserved.

diff --git a/resource/my_basic.rc b/resource/my_basic.rc index af64238..4aa7eac 100755 --- a/resource/my_basic.rc +++ b/resource/my_basic.rc @@ -57,7 +57,7 @@ VALUE "FileDescription", "MY-BASIC Interpreter for Windows" VALUE "FileVersion", "1, 2, 0, 0" VALUE "InternalName", "my_basic" - VALUE "LegalCopyright", "Copyright (C) 2011 - 2019 Wang Renxin" + VALUE "LegalCopyright", "Copyright (C) 2011 - 2020 Wang Renxin" VALUE "LegalTrademarks", "MY-BASIC" VALUE "OriginalFilename", "my_basic.exe" VALUE "ProductName", "MY-BASIC" diff --git a/shell/main.c b/shell/main.c index 25ed031..a95184d 100755 --- a/shell/main.c +++ b/shell/main.c @@ -3,7 +3,7 @@ ** ** For the latest info, see https://github.com/paladin-t/my_basic/ ** -** Copyright (C) 2011 - 2019 Wang Renxin +** Copyright (C) 2011 - 2020 Wang Renxin ** ** Permission is hereby granted, free of charge, to any person obtaining a copy of ** this software and associated documentation files (the "Software"), to deal in @@ -979,7 +979,7 @@ static void _list_directory(const char* path) { static void _show_tip(void) { _printf("MY-BASIC Interpreter Shell - %s\n", mb_ver_string()); - _printf("Copyright (C) 2011 - 2019 Wang Renxin. All Rights Reserved.\n"); + _printf("Copyright (C) 2011 - 2020 Wang Renxin. All Rights Reserved.\n"); _printf("For more information, see https://github.com/paladin-t/my_basic/.\n"); _printf("Input HELP and hint enter to view help information.\n"); }