From df15511d7eb1a066f5ba5fe3a3145ebd7e6704d0 Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sun, 13 Feb 2022 22:33:19 +0000 Subject: [PATCH] Bug fix for semantic versioning with prerelease modifiers --- Languages/Inter Pipeline.ildf | 1 + README.md | 2 +- Tangled/inweb.c | 10 +++++----- build.txt | 4 ++-- docs/foundation-module/7-vn.html | 4 ++-- docs/goldbach/goldbach.pdf | Bin 251986 -> 251986 bytes foundation-module/Chapter 7/Version Numbers.w | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Languages/Inter Pipeline.ildf b/Languages/Inter Pipeline.ildf index 56d9fe8..03ecc68 100644 --- a/Languages/Inter Pipeline.ildf +++ b/Languages/Inter Pipeline.ildf @@ -1,6 +1,7 @@ Name: "Inter Pipeline" Details: "For pipelines of Inform code-generation stages" Extension: ".interpipeline" +Line Comment: "!" colouring { instances of "->" { diff --git a/README.md b/README.md index 6392522..16eafcb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inweb 7 -v7-alpha.1+1A77 'Escape to Danger' (28 November 2021) +v7-alpha.1+1A78 'Escape to Danger' (13 February 2022) ## About Inweb diff --git a/Tangled/inweb.c b/Tangled/inweb.c index 2ab4dab..953cc5b 100644 --- a/Tangled/inweb.c +++ b/Tangled/inweb.c @@ -8572,11 +8572,11 @@ int CommandLine__read_pair_p(text_stream *opt, text_stream *opt_val, int N, ; innocuous = TRUE; break; case VERSION_CLSW: { PRINT("inweb"); - char *svn = "7-alpha.1+1A76"; + char *svn = "7-alpha.1+1A77"; if (svn[0]) PRINT(" version %s", svn); char *vname = "Escape to Danger"; if (vname[0]) PRINT(" '%s'", vname); - char *d = "11 August 2021"; + char *d = "28 November 2021"; if (d[0]) PRINT(" (%s)", d); PRINT("\n"); innocuous = TRUE; break; @@ -13938,8 +13938,8 @@ int VersionNumbers__le(semantic_version_number V1, semantic_version_number V2) { I1 = LinkedLists__next(I1); I2 = LinkedLists__next(I2); } - if ((I1 == NULL) && (I2)) return TRUE; - if ((I1) && (I2 == NULL)) return FALSE; + if ((I1 == NULL) && (I2)) return FALSE; + if ((I1) && (I2 == NULL)) return TRUE; return TRUE; } @@ -30282,7 +30282,7 @@ void Ctags__write(web *W, filename *F) { WRITE("!_TAG_FILE_SORTED\t0\t/0=unsorted, 1=sorted, 2=foldcase/\n"); WRITE("!_TAG_PROGRAM_AUTHOR\tGraham Nelson\t/graham.nelson@mod-langs.ox.ac.uk/\n"); WRITE("!_TAG_PROGRAM_NAME\tinweb\t//\n"); - WRITE("!_TAG_PROGRAM_VERSION\t7-alpha.1+1A76\t/built 11 August 2021/\n"); + WRITE("!_TAG_PROGRAM_VERSION\t7-alpha.1+1A77\t/built 28 November 2021/\n"); } #line 47 "inweb/Chapter 6/Ctags Support.w" diff --git a/build.txt b/build.txt index 6f98f6c..69b0a11 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: alpha.1 -Build Date: 28 November 2021 -Build Number: 1A77 +Build Date: 13 February 2022 +Build Number: 1A78 diff --git a/docs/foundation-module/7-vn.html b/docs/foundation-module/7-vn.html index d6869a6..6c6dde8 100644 --- a/docs/foundation-module/7-vn.html +++ b/docs/foundation-module/7-vn.html @@ -306,8 +306,8 @@ prerelease elements. Build metadata is disregarded entirely. I1 = LinkedLists::next(I1); I2 = LinkedLists::next(I2); } - if ((I1 == NULL) && (I2)) return TRUE; - if ((I1) && (I2 == NULL)) return FALSE; + if ((I1 == NULL) && (I2)) return FALSE; + if ((I1) && (I2 == NULL)) return TRUE; return TRUE; } diff --git a/docs/goldbach/goldbach.pdf b/docs/goldbach/goldbach.pdf index c6c3e23d5099322348e9e639fb8cb33b83204d07..db09b3e00376e799e69a853f7db4ace89baae243 100644 GIT binary patch delta 135 zcmcb#f&bD5{)QID7N#xC+$YtI42%qojf{+q4UD5Sx%7SWQ(O{DQWZ2@tbj5I$?Zlb znOE{UyBL@lS{fLdJDIq;nY%eVSsEI+8Jd|GJGq#c8ko8`+9}u&QnFp{I>GITa_b+uElA*5ux+;wIXMgadV BBdY)a diff --git a/foundation-module/Chapter 7/Version Numbers.w b/foundation-module/Chapter 7/Version Numbers.w index efa213a..5ffff57 100644 --- a/foundation-module/Chapter 7/Version Numbers.w +++ b/foundation-module/Chapter 7/Version Numbers.w @@ -239,8 +239,8 @@ int VersionNumbers::le(semantic_version_number V1, semantic_version_number V2) { I1 = LinkedLists::next(I1); I2 = LinkedLists::next(I2); } - if ((I1 == NULL) && (I2)) return TRUE; - if ((I1) && (I2 == NULL)) return FALSE; + if ((I1 == NULL) && (I2)) return FALSE; + if ((I1) && (I2 == NULL)) return TRUE; return TRUE; }