Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Makefile

@@ -58,6 +58,7 @@ INCLUDE=include
 MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\" 
 
 CFLAGS= -O2 -g \
+	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \
 	-I$(INCLUDE) \

gen164/5/repg.c

@@ -18,7 +18,6 @@
     c3_y* rep_y = u2_cr_tape(rep);
 
 
-
     char* rec = (char*)lub_y;
     char* end;
     while(*rec != 0) {
@@ -59,7 +58,7 @@
     opt = cre2_opt_new();
     if (opt) {
       cre2_opt_set_log_errors(opt, 0);
-      cre2_opt_set_encoding(opt, CRE2_Latin1);
+      cre2_opt_set_encoding(opt, CRE2_UTF8);
       cre2_opt_set_perl_classes(opt, 1);
       cre2_opt_set_one_line(opt, 1);
       cre2_opt_set_longest_match(opt, 1);
@@ -76,7 +75,7 @@
 
             if (!match) {
               if(rad_y[ic])
-                ret = u2_cn_cell((u2_atom)rad_y[ic], ret);
+                ret = u2_cn_cell((c3_y)rad_y[ic], ret);
               ic++;
             }
             else {

gen164/6/ap.c

@@ -102,9 +102,7 @@
                     u2_nul,
                     u2_nul));
   }
-/***
+
-****
-***/
 /***
 ****
 ***/
@@ -124,6 +122,17 @@
                 _open_in_wtbr(wir_r, tp_gen));
     }
   }
+  _open_do_pqr(wtkt)   //  ?^
+  {
+    //        [%wtkt *]   [%wtcl [%wtts [%axil %atom %$] p.gen] r.gen q.gen]
+    return u2_bq
+      (wir_r, c3__wtcl,
+              u2_bt(wir_r, c3__wtts,
+		           u2_bt(wir_r, c3__axil, c3__atom, u2_blip),
+	                   u2_rx(wir_r, p_gen)),
+              u2_rx(wir_r, r_gen),
+              u2_rx(wir_r, q_gen));
+  }
   _open_do_pq(wtgl)   //  ?<
   {
     return u2_bq
@@ -184,10 +193,9 @@
                 u2_bt(wir_r, c3__dtzz, 'f', u2_no));
     }
   }
-#if 0
   _open_do_pqr(wtls)  //  ?+
   {    u2_noun tul = u2_bc(wir_r,
-                        u2_bc(wir_r, u2_bc(wir_r, c3__bcts, c3__noun),
+                        u2_bc(wir_r, u2_bc(wir_r, c3__axil, c3__noun),
                                      u2_rx(wir_r, q_gen)),
                         u2_nul);
     u2_noun zal = j2_mbc(Pt2, weld)(wir_r, r_gen, tul);
@@ -196,7 +204,6 @@
     u2_rz(wir_r, tul);
     return ret;
   }
-#endif
   _open_do_p(wtzp)    //  ?!
   {
     return u2_bq
@@ -210,7 +217,6 @@
 ***/
   _open_do_pq(clhp) //  :-
   {
-    printf("wongwong!\n");
     return u2_bc
       (wir_r, u2_rx(wir_r, p_gen),
               u2_rx(wir_r, q_gen));
@@ -332,6 +338,13 @@
 /***
 ****
 ***/
+  _open_do_pq(brcb)   //  |_
+  {
+    //        [%brcb *]  [%tsls [%bctr p.gen] [%brcn q.gen]]
+    return u2_bt(wir_r, c3__tsls,
+		        u2_bc(wir_r, c3__bctr, u2_rx(wir_r, p_gen)),
+		        u2_bc(wir_r, c3__brcn, u2_rx(wir_r, q_gen)));
+  }
   _open_do_pq(brkt)   //  &-
   {
     //  [%brkt *]   [%tsgr [%brcn (~(put by q.gen) %% [%ash p.gen])] %%]
@@ -465,12 +478,6 @@
          _smcl_in(wir_r, q_gen));
     }
   }
-#if 0
-  _open_do_p(smdq)
-  {
-    return _ap_snig(p_gen);
-  }
-#endif
 
 /* functions
 */
@@ -526,49 +533,41 @@
               return u2_bl_bail(wir_r, c3__fail); \
             } else return _open_in_##stem(wir_r, p_gen, q_gen, r_gen, s_gen);
 
-        _open_pq  (tsgl);
-        _open_pq  (tshp);
-        _open_pq  (tsls);
-
         _open_p   (brhp);
         _open_p   (brdt);
-
+        _open_pq  (brcb);
+        _open_pq  (brkt);
 	_open_pq  (clcb);
 	_open_pq  (clhp);
         _open_pqrs(clkt);
         _open_pqr (clls);
         _open_p   (cltr);
         _open_p   (clsg);
-
-        _open_pqr (wtdt);
-        _open_pq  (wtgl);
-        _open_p   (wtzp);
-        _open_p   (wtbr);
-        _open_p   (wtpm);
-	// _open_pqr (wtls);
-        // _open_pqr (wtsg);
-        _open_pq  (wthp);
-        _open_pq  (wtgr);
-
         _open_pq  (cncl);
         _open_pq  (cndt);
         _open_pqrs(cnkt);
         _open_pq  (cnhp);
         _open_pqr (cnls);
         _open_pqr (cnsg);
-
-        _open_pq  (brkt);
-
 	_open_pq  (sgts);
 	_open_pq  (sgbr);
 	_open_pq  (sggl);
 	_open_pq  (sgbc);
 	_open_pqrs(sgcn);
 	_open_pq  (sgls);
-
         _open_pq  (smcl);
-        // _open_p   (smdq);
+        _open_pq  (tsgl);
-        // _open_pq  (smsg);
+        _open_pq  (tshp);
+        _open_pq  (tsls);
+        _open_pqr (wtdt);
+        _open_pq  (wtgl);
+        _open_p   (wtzp);
+        _open_p   (wtbr);
+        _open_pq  (wthp);
+        _open_pq  (wtgr);
+        _open_pqr (wtls);
+        _open_pqr (wtkt);
+        _open_p   (wtpm);
       }
     }
 

include/c/motes.h

@@ -4,6 +4,7 @@
 */
   /** Definitions.
   **/
+
 #   define c3__abo    c3_s3('a','b','o')
 #   define c3__actd   c3_s4('a','c','t','d')
 #   define c3__add    c3_s3('a','d','d')
@@ -21,6 +22,7 @@
 #   define c3__at     c3_s2('a','t')
 #   define c3__atom   c3_s4('a','t','o','m')
 #   define c3__axe    c3_s3('a','x','e')
+#   define c3__axil   c3_s4('a','x','i','l')
 #   define c3__axis   c3_s4('a','x','i','s')
 #   define c3__bac    c3_s3('b','a','c')
 #   define c3__bach   c3_s4('b','a','c','h')
@@ -97,6 +99,7 @@
 #   define c3__bran   c3_s4('b','r','a','n')
 #   define c3__brax   c3_s4('b','r','a','x')
 #   define c3__brbn   c3_s4('b','r','b','n')
+#   define c3__brcb   c3_s4('b','r','c','b')
 #   define c3__brcn   c3_s4('b','r','c','n')
 #   define c3__brcs   c3_s4('b','r','c','s')
 #   define c3__brdg   c3_s4('b','r','d','g')
@@ -1103,6 +1106,7 @@
 #   define c3__wtgr   c3_s4('w','t','g','r')
 #   define c3__wthp   c3_s4('w','t','h','p')
 #   define c3__wthx   c3_s4('w','t','h','x')
+#   define c3__wtkt   c3_s4('w','t','k','t')
 #   define c3__wtls   c3_s4('w','t','l','s')
 #   define c3__wtms   c3_s4('w','t','m','s')
 #   define c3__wtpm   c3_s4('w','t','p','m')