From 2f3db2f2c9eb0053e2edfe80802f62554fb2c79a Mon Sep 17 00:00:00 2001 From: "Peter Helcmanovsky (Ped)" Date: Wed, 21 Jun 2023 22:33:08 +0200 Subject: [PATCH] bumping version to v1.20.3 + updating changelog --- CHANGELOG.md | 7 +++++++ docs/documentation.html | 4 ++-- docs/documentation.xml | 4 ++-- sjasm/sjdefs.h | 4 ++-- tests/define/predefined_date_time.asm | 4 ++-- .../opt version/option version.cli | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe624473..0e57353e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ +## [1.20.3](https://github.com/z00m128/sjasmplus/releases/tag/v1.20.3) - 23.6.2023 +- added alias [`--define`](https://z00m128.github.io/sjasmplus/documentation.html#s_cli) for `-D` +- added [string-literals](https://z00m128.github.io/sjasmplus/documentation.html#s_strings) suffixes Z and C to add zero or set high bit of last char +- end of line backslash continues source line ([limited support](https://github.com/z00m128/sjasmplus/blob/master/tests/parsing/escape_eol.asm), not recommended) +- Lua: minor version upgrade to 5.4.6 (from 5.4.4) +- minor updates to Makefile + ## [1.20.2](https://github.com/z00m128/sjasmplus/releases/tag/v1.20.2) - 14.2.2023 - added optional second argument for [`DUP`](https://z00m128.github.io/sjasmplus/documentation.html#po_dup) to have index variable - option `--exp` will create file even when no `EXPORT` is used diff --git a/docs/documentation.html b/docs/documentation.html index f8fa0bfb..7c99b35f 100644 --- a/docs/documentation.html +++ b/docs/documentation.html @@ -1,4 +1,4 @@ -SjASMPlus 1.20.2 Documentation [2023-02-14]

SjASMPlus 1.20.2 Documentation [2023-02-14]

1. Introduction
License
What is it?
Main Features
Credits
Feedback
What's new?
2. Where to get and how to use
Packages
Command line
Warnings with id
Source file format
3. Labels
Labels
Local labels
@ Labels
Temporary labels
4. Constants, expressions and other features
Numeric constants
Character and string constants
Expressions
Assembly language
Fake instructions
Real device emulation mode
Predefined defines
5. Pseudo-ops (aka Pseudo-instructions, Directives etc)
Simple example of usage
Pseudo-ops
Conditional assembly
Macros
6. Structures
What is it?
Defining structure
STRUCT instructions
Usage of defined structure
Examples
7. Lua scripting
Why?
How to use?
SjASMPlus functions bindings to Lua
Third-party embedded library(ies)
Example
8. SAVENEX guide
NEX File Format
Detailed description of each SAVENEX command
Examples
9. Source Level Debugging (SLD) data
What is it?
Usage
How to write "non tricky" source
SLD File Format definition (version "1")
Index
+SjASMPlus 1.20.3 Documentation [2023-06-23]

SjASMPlus 1.20.3 Documentation [2023-06-23]

1. Introduction
License
What is it?
Main Features
Credits
Feedback
What's new?
2. Where to get and how to use
Packages
Command line
Warnings with id
Source file format
3. Labels
Labels
Local labels
@ Labels
Temporary labels
4. Constants, expressions and other features
Numeric constants
Character and string constants
Expressions
Assembly language
Fake instructions
Real device emulation mode
Predefined defines
5. Pseudo-ops (aka Pseudo-instructions, Directives etc)
Simple example of usage
Pseudo-ops
Conditional assembly
Macros
6. Structures
What is it?
Defining structure
STRUCT instructions
Usage of defined structure
Examples
7. Lua scripting
Why?
How to use?
SjASMPlus functions bindings to Lua
Third-party embedded library(ies)
Example
8. SAVENEX guide
NEX File Format
Detailed description of each SAVENEX command
Examples
9. Source Level Debugging (SLD) data
What is it?
Usage
How to write "non tricky" source
SLD File Format definition (version "1")
Index

Chapter 1. Introduction

@@ -133,7 +133,7 @@

What's new?

-
WIP - 1.20.3
+
23.6.2023 - 1.20.3
- added alias `--define` for `-D`
 - added string-literals suffixes Z and C to add zero or set high bit of last char
 - end of line backslash continues source line (limited support, not recommended)
diff --git a/docs/documentation.xml b/docs/documentation.xml
index a3c3df4c..0062aac5 100644
--- a/docs/documentation.xml
+++ b/docs/documentation.xml
@@ -2,7 +2,7 @@
 
 
-  SjASMPlus 1.20.2 Documentation [2023-02-14]
+  SjASMPlus 1.20.3 Documentation [2023-06-23]
 
   
     Introduction
@@ -204,7 +204,7 @@
       
 
 
-            WIP - 1.20.3
+            23.6.2023 - 1.20.3
 
             
               - added alias `--define` for `-D`
diff --git a/sjasm/sjdefs.h b/sjasm/sjdefs.h
index a9634f4c..59754598 100644
--- a/sjasm/sjdefs.h
+++ b/sjasm/sjdefs.h
@@ -30,8 +30,8 @@
 #define __SJDEFS
 
 // version string
-#define VERSION "1.20.2"
-#define VERSION_NUM "0x00011402"
+#define VERSION "1.20.3"
+#define VERSION_NUM "0x00011403"
 
 #define LASTPASS 3
 
diff --git a/tests/define/predefined_date_time.asm b/tests/define/predefined_date_time.asm
index af043817..0a849051 100644
--- a/tests/define/predefined_date_time.asm
+++ b/tests/define/predefined_date_time.asm
@@ -9,7 +9,7 @@
     DD  __ERRORS__, __WARNINGS__
     DB  __PASS__
 
-; 1.20.2 version check (needs update upon release)
+; 1.20.3 version check (needs update upon release)
     ASSERT 1 == (__SJASMPLUS__>>16)
     ASSERT 20 == ((__SJASMPLUS__>>8)&0xFF)
-    ASSERT 2 == (__SJASMPLUS__&0xFF)
+    ASSERT 3 == (__SJASMPLUS__&0xFF)
diff --git a/tests/test build script and options/opt version/option version.cli b/tests/test build script and options/opt version/option version.cli
index 3b08777e..8d5fc1c1 100644
--- a/tests/test build script and options/opt version/option version.cli	
+++ b/tests/test build script and options/opt version/option version.cli	
@@ -3,7 +3,7 @@
 $MEMCHECK "$EXE" -Wno-behost -h | head -n 1 > help_line1.out &&\
 $MEMCHECK "$EXE" -Wno-behost --version 2> version.out &&\
 $MEMCHECK "$EXE" -Wno-behost --nologo --version 2> raw_version.out &&\
-echo "1.20.2" > raw.expected &&\
+echo "1.20.3" > raw.expected &&\
 diff -a --strip-trailing-cr help_line1.out version.out &&\
 diff -a --strip-trailing-cr raw.expected raw_version.out
 last_result=$?