Merge remote-tracking branch 'origin/master' into typedclay

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook

.gitignore

@@ -8,3 +8,4 @@
 /vere.pkg
 /.MAKEFILE-VERSION
 /make.conf
+node_modules/

LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Urbit
+
+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.

Makefile

@@ -86,8 +86,11 @@ CWFLAGS=-Wall \
         -Wno-sign-compare \
         -Wno-unused-parameter \
         -Wno-missing-field-initializers \
-        -Wno-error=unused-result \
+        -Wno-strict-aliasing \
         -Werror
+ifneq ($(OS),bsd)
+  CWFLAGS+=-Wno-error=unused-result
+endif
 
 ifdef NO_SILENT_RULES
 %.o: %.c $(CORE)
@@ -377,7 +380,7 @@ $(LIBCOMMONMARK):
 	$(MAKE) -C outside/commonmark
 
 $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2)
-	$(CXX) $(CXXFLAGS) -c $< $(LIBRE2) -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(V_OFILES): i/v/vere.h
 

README.markdown

@@ -56,10 +56,10 @@ Otherwise, install XCode: `https://developer.apple.com/xcode/`, with the command
 
 To install dependencies pick either one of Homebrew or Macports, but not both:  
   Homebrew -  
-  `brew install git gmp libsigsegv openssl libtool autoconf automake`  
+  `brew install git gmp libsigsegv openssl libtool autoconf automake cmake`  
 
   Macports -  
-  `sudo port install git gmp libsigsegv openssl autoconf automake`
+  `sudo port install git gmp libsigsegv openssl autoconf automake cmake`
 
 Although automake/autoconf/libtool are generally installed by default, some
 have reported needing to uninstall and reinstall those three packages, at least

i/n/m.h

@@ -24,7 +24,7 @@
       **    %oops               ::  assertion failure
       */ 
         c3_i
-        u3m_bail(c3_m how_m);
+        u3m_bail(c3_m how_m) __attribute__((noreturn));
 
       /* u3m_file(): load file, as atom, or bail.
       */

i/v/vere.h

@@ -201,12 +201,15 @@
     /* u3_ames: ames networking.
     */
       typedef struct _u3_ames {             //  packet network state
-        uv_udp_t   wax_u;                   //  socket state
-        uv_timer_t tim_u;                   //  network timer
-        c3_o       alm;                     //  alarm on
-        c3_w       law_w;                   //  last wakeup, unix time
-        c3_s       por_s;                   //  public IPv4 port
-        c3_w       imp_w[256];              //  imperial IPs
+        union {
+          uv_udp_t    wax_u;
+          uv_handle_t had_u;
+        };
+        uv_timer_t    tim_u;                //  network timer
+        c3_o          alm;                  //  alarm on
+        c3_w          law_w;                //  last wakeup, unix time
+        c3_s          por_s;                //  public IPv4 port
+        c3_w          imp_w[256];           //  imperial IPs
       } u3_ames;
 
     /* u3_save: checkpoint control.

j/a/add.c

@@ -1,6 +1,5 @@
 /* j/1/add.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/dec.c

@@ -1,6 +1,5 @@
 /* j/1/dec.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/div.c

@@ -1,6 +1,5 @@
 /* j/1/div.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/gte.c

@@ -1,6 +1,5 @@
 /* j/1/gte.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/gth.c

@@ -1,6 +1,5 @@
 /* j/1/gth.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/lte.c

@@ -1,6 +1,5 @@
 /* j/1/lte.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/lth.c

@@ -1,6 +1,5 @@
 /* j/1/lth.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/mod.c

@@ -1,6 +1,5 @@
 /* j/1/mod.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/mul.c

@@ -1,6 +1,5 @@
 /* j/1/mul.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/a/sub.c

@@ -1,6 +1,5 @@
 /* j/1/sub.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/bind.c

@@ -1,6 +1,5 @@
 /* j/2/bind.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/clap.c

@@ -1,6 +1,5 @@
 /* j/2/clap.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/drop.c

@@ -1,6 +1,5 @@
 /* j/2/drop.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/flop.c

@@ -1,6 +1,5 @@
 /* j/2/flop.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/lent.c

@@ -1,6 +1,5 @@
 /* j/2/lent.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/levy.c

@@ -1,6 +1,5 @@
 /* j/2/levy.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/lien.c

@@ -1,6 +1,5 @@
 /* j/2/lien.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/need.c

@@ -1,6 +1,5 @@
 /* j/2/need.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/reel.c

@@ -1,6 +1,5 @@
 /* j/2/reel.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/roll.c

@@ -1,6 +1,5 @@
 /* j/2/roll.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/scag.c

@@ -1,6 +1,5 @@
 /* j/2/scag.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/skim.c

@@ -1,6 +1,5 @@
 /* j/2/skim.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/skip.c

@@ -1,6 +1,5 @@
 /* j/2/skip.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/slag.c

@@ -1,6 +1,5 @@
 /* j/2/slag.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/snag.c

@@ -1,6 +1,5 @@
 /* j/2/snag.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/sort.c

@@ -1,6 +1,5 @@
 /* j/2/sort.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/turn.c

@@ -1,6 +1,5 @@
 /* j/2/turn.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/b/weld.c

@@ -1,6 +1,5 @@
 /* j/2/weld.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/bex.c

@@ -1,6 +1,5 @@
 /* j/3/bex.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/can.c

@@ -1,6 +1,5 @@
 /* j/3/can.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/cap.c

@@ -1,6 +1,5 @@
 /* j/3/cap.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/cat.c

@@ -1,6 +1,5 @@
 /* j/3/cat.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/con.c

@@ -1,6 +1,5 @@
 /* j/3/con.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/cut.c

@@ -1,6 +1,5 @@
 /* j/3/cut.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/dis.c

@@ -1,6 +1,5 @@
 /* j/3/dis.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/dor.c

@@ -1,6 +1,5 @@
 /* j/3/dor.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/end.c

@@ -1,6 +1,5 @@
 /* j/3/end.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/gor.c

@@ -1,6 +1,5 @@
 /* j/3/gor.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/hor.c

@@ -1,6 +1,5 @@
 /* j/3/hor.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/lsh.c

@@ -1,6 +1,5 @@
 /* j/3/lsh.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/mas.c

@@ -1,6 +1,5 @@
 /* j/3/mas.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/met.c

@@ -1,6 +1,5 @@
 /* j/3/met.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/mix.c

@@ -1,6 +1,5 @@
 /* j/3/mix.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/mug.c

@@ -1,6 +1,5 @@
 /* j/3/mug.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/peg.c

@@ -1,6 +1,5 @@
 /* j/3/peg.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/po.c

@@ -1,6 +1,5 @@
 /* j/3/po.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/rap.c

@@ -1,6 +1,5 @@
 /* j/3/rap.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/rip.c

@@ -1,6 +1,5 @@
 /* j/3/rip.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/rsh.c

@@ -1,6 +1,5 @@
 /* j/3/rsh.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/c/vor.c

@@ -1,6 +1,5 @@
 /* j/3/vor.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_gas.c

@@ -1,6 +1,5 @@
 /* j/4/gas.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_get.c

@@ -1,6 +1,5 @@
 /* j/4/by_get.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_has.c

@@ -1,6 +1,5 @@
 /* j/4/by_has.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_int.c

@@ -1,6 +1,5 @@
 /* j/4/by_int.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_put.c

@@ -1,6 +1,5 @@
 /* j/4/put.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/by_uni.c

@@ -1,6 +1,5 @@
 /* j/4/by_uni.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_gas.c

@@ -1,6 +1,5 @@
 /* j/4/gas.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_has.c

@@ -1,6 +1,5 @@
 /* j/4/in_has.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_int.c

@@ -1,6 +1,5 @@
 /* j/4/in_int.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_mer.c

@@ -1,6 +1,5 @@
 /* j/4/in_mer.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_put.c

@@ -1,6 +1,5 @@
 /* j/4/in_put.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_tap.c

@@ -1,6 +1,5 @@
 /* j/4/in_tap.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/d/in_uni.c

@@ -1,6 +1,5 @@
 /* j/4/in_uni.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/aesc.c

@@ -1,6 +1,5 @@
 /* j/5/aes.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/cue.c

@@ -1,6 +1,5 @@
 /* j/5/cue.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/ed_puck.c

@@ -1,6 +1,5 @@
 /* gen164/5/ed_puck.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/ed_sign.c

@@ -1,6 +1,5 @@
 /* gen164/5/ed_sign.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/ed_veri.c

@@ -1,6 +1,5 @@
 /* gen164/5/ed_veri.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/jam.c

@@ -1,6 +1,5 @@
 /* j/5/jam.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/lore.c

@@ -1,6 +1,5 @@
 /* j/5/lore.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/loss.c

@@ -1,6 +1,5 @@
 /* j/5/loss.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/mat.c

@@ -1,6 +1,5 @@
 /* j/3/mat.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/mink.c

@@ -1,6 +1,5 @@
 /* j/5/mink.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/mule.c

@@ -1,6 +1,5 @@
 /* j/5/mule.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/parse.c

@@ -1,6 +1,5 @@
 /* j/5/parse.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/rd.c

@@ -1,6 +1,5 @@
 /* j/5/aes.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/repg.c

@@ -1,6 +1,5 @@
 /* j/5/repg.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/rexp.c

@@ -1,6 +1,5 @@
 /* j/5/rexp.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/rub.c

@@ -1,6 +1,5 @@
 /* j/3/rub.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/shax.c

@@ -1,6 +1,5 @@
 /* j/5/shax.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/tape.c

@@ -1,6 +1,5 @@
 /* j/3/tape.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/e/trip.c

@@ -1,6 +1,5 @@
 /* j/5/trip.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/al.c

@@ -1,6 +1,5 @@
 /* j/6/al.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/ap.c

@@ -1,6 +1,5 @@
 /* j/6/ap.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 
@@ -556,6 +555,7 @@
               u3nc(c3__germ, u3k(p_gen)),
               u3k(q_gen));
   }
+#if 0
   _open_do_pq(sgbr)   //  ~|
   {
     return u3nt
@@ -563,6 +563,7 @@
               u3nc(c3__mean, u3k(p_gen)),
               u3k(q_gen));
   }
+#endif
   _open_do_pq(sggl)   //  ~>
   {
     return u3nt
@@ -831,7 +832,7 @@
 	_open_pq  (kthp);
 
 	_open_pq  (sgts);
-	_open_pq  (sgbr);
+//	_open_pq  (sgbr);
 	_open_pq  (sggl);
 	_open_pq  (sgbc);
 	_open_pq  (sgcb);

j/f/bull.c

@@ -1,6 +1,5 @@
 /* j/6/bull.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/cell.c

@@ -1,6 +1,5 @@
 /* j/6/cell.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/comb.c

@@ -1,6 +1,5 @@
 /* j/6/comb.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/cons.c

@@ -1,6 +1,5 @@
 /* j/6/cons.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/core.c

@@ -1,6 +1,5 @@
 /* j/6/core.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/cube.c

@@ -1,6 +1,5 @@
 /* j/6/cube.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/face.c

@@ -1,6 +1,5 @@
 /* j/6/face.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/fine.c

@@ -1,6 +1,5 @@
 /* j/6/fine.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/fitz.c

@@ -1,6 +1,5 @@
 /* j/6/fitz.c
 **
-** This file is in the public domain.
 */
 #include "all.h"
 

j/f/flan.c

@@ -1,6 +1,5 @@
 /* j/6/flan.c
 **
-** This file is in the public domain.
 */
 #include "all.h"