Skip to content

Commit

Permalink
Merge pull request #192 from Kray-G/develop
Browse files Browse the repository at this point in the history
Bumped a version number to 0.21.1
  • Loading branch information
Kray-G committed Jan 29, 2021
2 parents 515372b + 1e48858 commit a4136d2
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 19 deletions.
7 changes: 3 additions & 4 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
## V0.21.0 (Current Development Version)

* Updated
* Supported an assignment with an object key style.
* `{ x, y } = { x: 10, y: 100 }` means `x = 10, y = 100`.
* Some bug fixes and improvement.

## V0.20.0 (20th Preview Release) - 2021/01/29
## V0.20.1 (20th Preview Release) - 2021/01/29

* Updated
* Added the same directory as a current parsing file to a search path for `using`.
Expand All @@ -34,6 +31,8 @@
* `var { x: a, y: b } = { x: 10, y: 100 }` means `a = 10, b = 100`.
* Supported a pattern matching syntax in assignment, declaration, and function arguments.
* `var { x: a, y: 100 } = { x: 10, y: m }` means `a = 10` if `m == 100`, otherwise an exception occurs.
* Supported an object key style also with an assignment.
* `{ x, y } = { x: 10, y: 100 }` means `x = 10, y = 100`.
* Relocation of build environment.
* Created a `build` directory and moved files needed at building to the `build` directory.
* Some bug fixes and improvement.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Looks like JavaScript, feels like Ruby, and it is a script language fitting in C

## Topics

* **Preview Release 0.20.0 is now available!** See <a href="https://github.com/Kray-G/kinx/releases">Releases</a>.<br />
* **Preview Release 0.20.1 is now available!** See <a href="https://github.com/Kray-G/kinx/releases">Releases</a>.<br />
* Now the Kinx is supporting the platform of **x86-64 Windows and Linux only**, because I have no environment.
* If you are interested in other platforms, **please check [here](#how-to-support-a-platform)**.
* **See [ChangeLog.md](ChangeLog.md)** about the history of this project.
Expand Down
8 changes: 4 additions & 4 deletions build/kinx.rc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
KINXICO ICON DISCARDABLE "kinxi.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,20,0,0
PRODUCTVERSION 0,20,0,0
FILEVERSION 0,20,1,0
PRODUCTVERSION 0,20,1,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0x00000000L
FILEOS VOS__WINDOWS32
Expand All @@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "-"
VALUE "FileDescription", "The Script Kinx"
VALUE "FileVersion", "0.20.0.0\0"
VALUE "FileVersion", "0.20.1.0\0"
VALUE "InternalName", "Kinx\0"
VALUE "LegalCopyright", "Copyright (C) 2019-2021 Kray-G\0"
VALUE "OriginalFilename", "kinx.exe\0"
VALUE "ProductName", "Kinx\0"
VALUE "ProductVersion", "0.20.0.0\0"
VALUE "ProductVersion", "0.20.1.0\0"
END
END
END
Expand Down
2 changes: 1 addition & 1 deletion build/make.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if "%1" == "" (
if exist "..\kinx.exe" (
..\kinx.exe utility\VersionSetup.kx 0.20.0
..\kinx.exe utility\VersionSetup.kx 0.20.1
)
cl.exe /DWINMAIN /Feaddpath.exe utility\src\addpath.c Advapi32.lib User32.lib /link /SUBSYSTEM:WINDOWS
cl.exe /Feaddpathc.exe utility\src\addpath.c Advapi32.lib User32.lib
Expand Down
2 changes: 1 addition & 1 deletion build/mkdeb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ checkinstall -D -y \
--nodoc \
--reset-uids=yes \
--pkgname=kinx \
--pkgversion="0.20.0" \
--pkgversion="0.20.1" \
--pkgrelease="0" \
--pkggroup="kinx" \
--arch=amd64 \
Expand Down
2 changes: 1 addition & 1 deletion include/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#endif
#define VER_MAJ 0
#define VER_MIN 20
#define VER_PAT 0
#define VER_PAT 1
#define VER_SUFFIX ""

#endif /* KX_VERSION_H */
Expand Down
2 changes: 1 addition & 1 deletion install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Unicode True

# Version
!define MAJ_VERSION "1"
!define VERSION_STRING "0.20.0"
!define VERSION_STRING "0.20.1"

# Application Name
Name "Kinx version ${VERSION_STRING} for x64"
Expand Down
4 changes: 2 additions & 2 deletions lib/std/DateTime.kx
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ _class DateTime(unixtime_, month_, day_, hour_, minute_, second_) {
return rhs == this;
}
if (rhs.isDateTime) {
return datetime_ == rhs.datetime();
return unixtime_ == rhs.unixtime();
}
return false;
}
public <=>(rhs) {
if (rhs.isDateTime) {
return rhs.datetime() - datetime_;
return rhs.unixtime() - unixtime_;
}
return false;
}
Expand Down
6 changes: 2 additions & 4 deletions src/ast_gencode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1685,15 +1685,13 @@ LOOP_HEAD:;
apply_getvals(ctx, cond->lhs, ana, next, 1);
add_pop(ana);
break;
case KXOP_MKRANGE:
default:
// This includes the case of KXOP_MKRANGE.
gencode_ast_hook(ctx, cond, ana, 0);
kv_push(kx_code_t, get_block(module, ana->block)->code, ((kx_code_t){ FILELINE(ana), .op = KX_EQEQ }));
kv_push(kx_code_t, get_block(module, ana->block)->code, ((kx_code_t){ FILELINE_OF(cond, ana), .op = KX_JZ, .value1.i = jmpblk }));
KX_NEW_BLK(module, ana);
break;
default:
kx_yyerror_line("Unsupported when condition expression", node->file, node->line);
break;
}
if (node->ex) {
gencode_ast_hook(ctx, node->ex, ana, 0);
Expand Down

0 comments on commit a4136d2

Please sign in to comment.