AwesomeAdam54321/inweb-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix for semantic versioning with prerelease modifiers

Browse source
This commit is contained in:
Graham Nelson 2022-02-13 22:33:19 +00:00
parent fbead7a233
commit df15511d7e
7 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Languages/Inter Pipeline.ildf
View file

@ -1,6 +1,7 @@
Name: "Inter Pipeline" Name: "Inter Pipeline"
Details: "For pipelines of Inform code-generation stages" Details: "For pipelines of Inform code-generation stages"
Extension: ".interpipeline" Extension: ".interpipeline"
Line Comment: "!"
colouring { colouring {
instances of "->" { instances of "->" {

2
README.md
View file

@ -1,6 +1,6 @@
# Inweb 7 # Inweb 7
v7-alpha.1+1A77 'Escape to Danger' (28 November 2021) v7-alpha.1+1A78 'Escape to Danger' (13 February 2022)
## About Inweb ## About Inweb

10
Tangled/inweb.c
View file

@ -8572,11 +8572,11 @@ int CommandLine__read_pair_p(text_stream *opt, text_stream *opt_val, int N,
; innocuous = TRUE; break; ; innocuous = TRUE; break;
case VERSION_CLSW: { case VERSION_CLSW: {
PRINT("inweb"); PRINT("inweb");
char *svn = "7-alpha.1+1A76"; char *svn = "7-alpha.1+1A77";
if (svn[0]) PRINT(" version %s", svn); if (svn[0]) PRINT(" version %s", svn);
char *vname = "Escape to Danger"; char *vname = "Escape to Danger";
if (vname[0]) PRINT(" '%s'", vname); if (vname[0]) PRINT(" '%s'", vname);
char *d = "11 August 2021"; char *d = "28 November 2021";
if (d[0]) PRINT(" (%s)", d); if (d[0]) PRINT(" (%s)", d);
PRINT("\n"); PRINT("\n");
innocuous = TRUE; break; innocuous = TRUE; break;
@ -13938,8 +13938,8 @@ int VersionNumbers__le(semantic_version_number V1, semantic_version_number V2) {
I1 = LinkedLists__next(I1); I1 = LinkedLists__next(I1);
I2 = LinkedLists__next(I2); I2 = LinkedLists__next(I2);
} }
if ((I1 == NULL) && (I2)) return TRUE; if ((I1 == NULL) && (I2)) return FALSE;
if ((I1) && (I2 == NULL)) return FALSE; if ((I1) && (I2 == NULL)) return TRUE;
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_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_AUTHOR\tGraham Nelson\t/graham.nelson@mod-langs.ox.ac.uk/\n");
WRITE("!_TAG_PROGRAM_NAME\tinweb\t//\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" #line 47 "inweb/Chapter 6/Ctags Support.w"

4
build.txt
View file

@ -1,3 +1,3 @@
Prerelease: alpha.1 Prerelease: alpha.1
Build Date: 28 November 2021 Build Date: 13 February 2022
Build Number: 1A77 Build Number: 1A78

4
docs/foundation-module/7-vn.html
View file

@ -306,8 +306,8 @@ prerelease elements. Build metadata is disregarded entirely.
<span class="plain-syntax"> </span><span class="identifier-syntax">I1</span><span class="plain-syntax"> = </span><a href="2-llas.html#SP7" class="function-link"><span class="function-syntax">LinkedLists::next</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">I1</span><span class="plain-syntax">);</span> <span class="plain-syntax"> </span><span class="identifier-syntax">I1</span><span class="plain-syntax"> = </span><a href="2-llas.html#SP7" class="function-link"><span class="function-syntax">LinkedLists::next</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">I1</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">I2</span><span class="plain-syntax"> = </span><a href="2-llas.html#SP7" class="function-link"><span class="function-syntax">LinkedLists::next</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">I2</span><span class="plain-syntax">);</span> <span class="plain-syntax"> </span><span class="identifier-syntax">I2</span><span class="plain-syntax"> = </span><a href="2-llas.html#SP7" class="function-link"><span class="function-syntax">LinkedLists::next</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">I2</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> }</span> <span class="plain-syntax"> }</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">I1</span><span class="plain-syntax"> == </span><span class="identifier-syntax">NULL</span><span class="plain-syntax">) &amp;&amp; (</span><span class="identifier-syntax">I2</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">TRUE</span><span class="plain-syntax">;</span> <span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">I1</span><span class="plain-syntax"> == </span><span class="identifier-syntax">NULL</span><span class="plain-syntax">) &amp;&amp; (</span><span class="identifier-syntax">I2</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">FALSE</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">I1</span><span class="plain-syntax">) &amp;&amp; (</span><span class="identifier-syntax">I2</span><span class="plain-syntax"> == </span><span class="identifier-syntax">NULL</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">FALSE</span><span class="plain-syntax">;</span> <span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">I1</span><span class="plain-syntax">) &amp;&amp; (</span><span class="identifier-syntax">I2</span><span class="plain-syntax"> == </span><span class="identifier-syntax">NULL</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">TRUE</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">TRUE</span><span class="plain-syntax">;</span> <span class="plain-syntax"> </span><span class="reserved-syntax">return</span><span class="plain-syntax"> </span><span class="constant-syntax">TRUE</span><span class="plain-syntax">;</span>
<span class="plain-syntax">}</span> <span class="plain-syntax">}</span>
</pre> </pre>

BIN
docs/goldbach/goldbach.pdf
View file

Binary file not shown.

4
foundation-module/Chapter 7/Version Numbers.w
View file

@ -239,8 +239,8 @@ int VersionNumbers::le(semantic_version_number V1, semantic_version_number V2) {
I1 = LinkedLists::next(I1); I1 = LinkedLists::next(I1);
I2 = LinkedLists::next(I2); I2 = LinkedLists::next(I2);
} }
if ((I1 == NULL) && (I2)) return TRUE; if ((I1 == NULL) && (I2)) return FALSE;
if ((I1) && (I2 == NULL)) return FALSE; if ((I1) && (I2 == NULL)) return TRUE;
return TRUE; return TRUE;
} }