summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <orib@google.com>2013-01-25 18:31:17 -0500
committerOri Bernstein <orib@google.com>2013-01-25 18:31:17 -0500
commitfac62869f84de9faad47572fef07654391de2e81 (patch)
tree067ae6dd6d4b628be274d462980093b880537a92
parente2ca5299d6dbc0da053609361789274c02e3a6aa (diff)
parent4931139165780ca410fe5ab41cac6d1af0af059e (diff)
downloadmc-fac62869f84de9faad47572fef07654391de2e81.tar.gz
Merge remote-tracking branch 'origin/nicer-ra'
-rw-r--r--LICENSE7
-rw-r--r--doc/lang.txt6
-rw-r--r--libstd/alloc.myr2
-rw-r--r--libstd/optparse.myr2
-rw-r--r--myrbuild/myrbuild.c1
-rw-r--r--parse/pickle.c1
6 files changed, 16 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..740e164
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2013 Ori Bernstein <ori@eigenstate.org>
+
+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.
diff --git a/doc/lang.txt b/doc/lang.txt
index bcf076a..d9c07e2 100644
--- a/doc/lang.txt
+++ b/doc/lang.txt
@@ -240,7 +240,11 @@ TABLE OF CONTENTS:
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:
diff --git a/libstd/alloc.myr b/libstd/alloc.myr
index 1cf6c74..ab7e383 100644
--- a/libstd/alloc.myr
+++ b/libstd/alloc.myr
@@ -30,8 +30,8 @@ pkg std =
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)
diff --git a/libstd/optparse.myr b/libstd/optparse.myr
index 037b1a4..6702514 100644
--- a/libstd/optparse.myr
+++ b/libstd/optparse.myr
@@ -15,7 +15,7 @@ pkg std =
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[:])
;;
diff --git a/myrbuild/myrbuild.c b/myrbuild/myrbuild.c
index c659737..3e1fbbc 100644
--- a/myrbuild/myrbuild.c
+++ b/myrbuild/myrbuild.c
@@ -111,6 +111,7 @@ void run(char **cmd)
printl(cmd);
pid = fork();
+ status = 0;
if (pid == -1) {
err(1, "Could not fork");
} else if (pid == 0) {
diff --git a/parse/pickle.c b/parse/pickle.c
index 8dcf769..44b49af 100644
--- a/parse/pickle.c
+++ b/parse/pickle.c
@@ -104,6 +104,7 @@ static Ucon *rducon(FILE *fd, Type *ut)
size_t id;
int line;
+ et = NULL;
line = rdint(fd);
id = rdint(fd);
name = unpickle(fd);