shithub: mc

Info  •  Files  •  Log  •  Branches

Merge remote-tracking branch 'origin/nicer-ra'

--- /dev/null

+++ b/LICENSE

@@ -1,0 +1,7 @@

+Copyright (c) 2013 Ori Bernstein <[email protected]>

+

+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 the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--- a/doc/lang.txt

+++ b/doc/lang.txt

@@ -240,7 +240,11 @@

             eg: :my_label

-        They can be used as targets for gotos.

+        They can be used as targets for gotos, as follows:

+

+            goto my_label

+

+        the ':' is not part of the label name.

     3.3. Control Constructs and Blocks:

--- a/libstd/alloc.myr

+++ b/libstd/alloc.myr

@@ -30,8 +30,8 @@

 	generic free	: (v:@a*	-> void)

 	generic slalloc	: (len : size	-> @a[:])

-	generic slfree	: (sl : @a[:]	-> void)

 	generic slgrow	: (sl : @a[:], len : size	-> @a[:])

+	generic slfree	: (sl : @a[:]	-> void)

 	const bytealloc	: (sz:size	-> byte*)

 	const bytefree	: (m:byte*, sz:size	-> void)

--- a/libstd/optparse.myr

+++ b/libstd/optparse.myr

@@ -15,7 +15,7 @@

 		arglist	: byte[:][:]

 	;;

-	const optinit	: (opts	: byte[:], opts : byte[:][:] -> optctx*)

+	const optinit	: (opts	: byte[:], args : byte[:][:] -> optctx*)

 	const optnext	: (ctx : optctx* -> char)

 	const optarg	: (ctx : optctx* -> byte[:])

 ;;

--- a/myrbuild/myrbuild.c

+++ b/myrbuild/myrbuild.c

@@ -111,6 +111,7 @@

     printl(cmd);

     pid = fork();

+    status = 0;

     if (pid == -1) {

         err(1, "Could not fork");

     } else if (pid == 0) {

--- a/parse/pickle.c

+++ b/parse/pickle.c

@@ -104,6 +104,7 @@

     size_t id;

     int line;

+    et = NULL;

     line = rdint(fd);

     id = rdint(fd);

     name = unpickle(fd);