New ponyrt

bundles/standard/String.enc

@@ -3,14 +3,15 @@ embed
 #include <strings.h>
 #include <alloca.h>
 #include <ctype.h>
-array_t *_init_argv(size_t argc, char **argv);
+array_t *_init_argv(pony_ctx_t* ctx, size_t argc, char **argv);
 body
-array_t *_init_argv(size_t argc, char **argv) {
-  array_t *arr = array_mk(argc, &_enc__passive_String_type);
+array_t *_init_argv(pony_ctx_t* ctx, size_t argc, char **argv) {
+  array_t *arr = array_mk(ctx, argc, &_enc__passive_String_type);
   for(int i = 0; i < argc; i++) {
-    _enc__passive_String_t* s = encore_alloc(sizeof(_enc__passive_String_t));
+    _enc__passive_String_t* s =
+      encore_alloc(ctx, sizeof(_enc__passive_String_t));
     s->_enc__self_type = &_enc__passive_String_type;
-    _enc__method_String__init(s, argv[i]);
+    _enc__method_String__init(ctx, s, argv[i]);
     array_set(arr, i, (encore_arg_t){.p = s});
   }
   return arr;
@@ -19,14 +20,14 @@ end
 
 def string_from_char(c : char) : String
   let
-    s = embed (embed char* end) encore_alloc(2); end
+    s = embed (embed char* end) encore_alloc(_ctx, 2); end
   in
     new String(embed (embed char* end) *#{s} = #{c}; #{s}; end)
 
 def string_from_array(arr : [char]) : String
   let
     len = |arr|
-    s = embed (embed char* end) encore_alloc(#{len} + 1); end
+    s = embed (embed char* end) encore_alloc(_ctx, #{len} + 1); end
     p = s
   in{
     for c in arr
@@ -64,7 +65,7 @@ passive class String
       b_data = b.data
     in
       new String(embed (embed char* end)
-        void *str = encore_alloc(#{t_len} + #{b_len} + 1);
+        void *str = encore_alloc(_ctx, #{t_len} + #{b_len} + 1);
         strncpy(str, (char *)#{t_data}, #{t_len});
         strncat(str, (char *)#{b_data}, #{b_len});
         str;
@@ -76,7 +77,7 @@ passive class String
       data  = this.data
     in
       new String(embed (embed char* end)
-        char *str = encore_alloc(#{t_len} + 1);
+        char *str = encore_alloc(_ctx, #{t_len} + 1);
         strncpy(str, (char *)#{data}, #{t_len} + 1);
         str;
       end)
@@ -117,7 +118,7 @@ passive class String
       data  = this.data
     in
       new String(embed (embed char* end)
-        char *str = encore_alloc(#{t_len} + 1);
+        char *str = encore_alloc(_ctx, #{t_len} + 1);
         for (int i = 0; i < #{t_len}; ++i)
           {
             str[i] = toupper(((char *)#{data})[i]);
@@ -133,7 +134,7 @@ passive class String
       data  = this.data
     in
       new String(embed (embed char* end)
-        char *str = encore_alloc(#{t_len} + 1);
+        char *str = encore_alloc(_ctx, #{t_len} + 1);
         for (int i = 0; i < #{t_len}; ++i)
           {
             str[i] = tolower(((char *)#{data})[i]);
@@ -164,7 +165,7 @@ passive class String
       then Just new String(embed (embed char* end)
           int siz = #{to} - #{from};
           siz = siz < #{t_len} ? siz : #{t_len};
-          char *str = encore_alloc(siz + 1);
+          char *str = encore_alloc(_ctx, siz + 1);
           strncpy(str, ((char *)#{data})+#{from}, siz);
           str[siz] = '\0';
           str;
@@ -251,7 +252,7 @@ passive class String
       char *pattern  = #{s}->_enc__field_data;
       char *tmp = NULL;
 
-      if (#{to_len} > STACK_ALLOC_MAX) { tmp = encore_alloc(#{to_len} + 1); } else { tmp = alloca(#{to_len}); }
+      if (#{to_len} > STACK_ALLOC_MAX) { tmp = encore_alloc(_ctx, #{to_len} + 1); } else { tmp = alloca(#{to_len}); }
 
       int copied = 0;
       int skipped = 0;
@@ -263,7 +264,7 @@ passive class String
         }
       strcpy(tmp + copied, from + copied + skipped);
 
-      char *result = encore_alloc(copied + 1);
+      char *result = encore_alloc(_ctx, copied + 1);
       strcpy(result, tmp);
       result;
     end)
@@ -318,4 +319,4 @@ passive class String
         };
         result[occurrences] = match this.substring(start, this.length()) with Just s => s;
         result;
-      }
+      }

src/back/CCode/Main.hs

@@ -100,3 +100,4 @@ data CCode a where
     Annotated    :: String -> CCode a -> CCode a
     FunPtrDecl   :: CCode Ty -> CCode Name -> [CCode Ty] -> CCode Stat
     CompoundLiteral :: CCode Ty -> [(CCode Lval, CCode Expr)] -> CCode Expr
+    DesignatedInitializer :: [(CCode Name, CCode Expr)] -> CCode Expr

src/back/CCode/PrettyCCode.hs

@@ -129,6 +129,12 @@ pp' (CompoundLiteral t pairs) =
     braced = text "{" <> body <> text "}"
   in
     text "&" <> struct <> braced
+pp' (DesignatedInitializer pairs) =
+  let
+    pairs' = [text "." <> pp' l <> text "=" <> pp' r | (l,r) <- pairs]
+    body = hcat $ intersperse (text ", ") pairs'
+  in
+    text "{" <> body <> text "}"
 
 commaList :: [CCode a] -> Doc
 commaList l = hcat $ intersperse (text ", ") $ map pp' l

src/back/CodeGen/CCodeNames.hs

@@ -20,6 +20,8 @@ import Data.List
 
 import qualified AST.AST as A
 
+import Text.Printf (printf)
+
 char :: CCode Ty
 char = Typ "char"
 
@@ -60,6 +62,18 @@ isEncoreArgT _ = False
 ponyMsgT :: CCode Ty
 ponyMsgT = Typ "pony_msg_t"
 
+ponyMainMsgName :: String
+ponyMainMsgName = "pony_main_msg_t"
+
+ponyMainMsgT :: CCode Ty
+ponyMainMsgT = Typ ponyMainMsgName
+
+encActiveMainName :: String
+encActiveMainName = "_enc__active_Main_t"
+
+encActiveMainT :: CCode Ty
+encActiveMainT = Typ encActiveMainName
+
 encMsgT :: CCode Ty
 encMsgT = Typ "encore_fut_msg_t"
 
@@ -92,6 +106,9 @@ rangeT = Typ "range_t"
 range :: CCode Ty
 range = Ptr rangeT
 
+optionT :: CCode Name
+optionT = Nam "option_t"
+
 option :: CCode Ty
 option = Ptr $ Typ "option_t"
 
@@ -104,6 +121,12 @@ capability = Ptr $ Typ "capability_t"
 ponyTraceFnType :: CCode Ty
 ponyTraceFnType = Typ "pony_trace_fn"
 
+ponyTraceObject :: CCode Name
+ponyTraceObject = Nam "pony_traceobject"
+
+ponyTraceActor :: CCode Name
+ponyTraceActor = Nam "pony_traceactor"
+
 unit :: CCode Lval
 unit = Embed "UNIT"
 
@@ -130,6 +153,10 @@ methodImplOneWayName :: Ty.Type -> ID.Name -> CCode Name
 methodImplOneWayName clazz mname =
   Nam $ methodImplOneWayNameStr clazz mname
 
+methodImplStreamName :: Ty.Type -> ID.Name -> CCode Name
+methodImplStreamName clazz mname =
+  Nam $ encoreName "method" $ printf "%s_%s_stream" (Ty.getId clazz) (show mname)
+
 methodImplNameStr :: Ty.Type -> ID.Name -> String
 methodImplNameStr clazz mname =
   encoreName "method" $ (Ty.getId clazz) ++ "_" ++ (show mname)
@@ -148,6 +175,9 @@ constructorImplName clazz = Nam $ encoreName "constructor" (Ty.getId clazz)
 encoreCreateName :: CCode Name
 encoreCreateName = Nam "encore_create"
 
+encoreAllocName :: CCode Name
+encoreAllocName = Nam "encore_alloc"
+
 partySequence :: CCode Name
 partySequence = Nam "party_sequence"
 
@@ -306,6 +336,12 @@ ponySendvName = Nam "pony_sendv"
 ponyGcSendName :: CCode Name
 ponyGcSendName = Nam "pony_gc_send"
 
+ponyGcRecvName :: CCode Name
+ponyGcRecvName = Nam "pony_gc_recv"
+
+ponyRecvDoneName :: CCode Name
+ponyRecvDoneName = Nam "pony_recv_done"
+
 ponySendDoneName :: CCode Name
 ponySendDoneName = Nam "pony_send_done"
 
@@ -321,9 +357,60 @@ runtimeTypeName ref = Nam $ (typeNamePrefix ref) ++ "_type"
 futureTraceFn :: CCode Name
 futureTraceFn = Nam "future_trace"
 
+futureFulfil :: CCode Name
+futureFulfil = Nam "future_fulfil"
+
+futureAwait :: CCode Name
+futureAwait = Nam "future_await"
+
+futureGetActor :: CCode Name
+futureGetActor = Nam "future_get_actor"
+
+futureChainActor :: CCode Name
+futureChainActor = Nam "future_chain_actor"
+
+actorSuspend :: CCode Name
+actorSuspend = Nam "actor_suspend"
+
+streamGet :: CCode Name
+streamGet = Nam "stream_get"
+
+streamPut :: CCode Name
+streamPut = Nam "stream_put"
+
+streamClose :: CCode Name
+streamClose = Nam "stream_close"
+
+streamGetNext :: CCode Name
+streamGetNext = Nam "stream_get_next"
+
+streamEos :: CCode Name
+streamEos = Nam "stream_eos"
+
+streamMkFn :: CCode Name
+streamMkFn = Nam "stream_mk"
+
 futureMkFn :: CCode Name
 futureMkFn = Nam "future_mk"
 
+rangeMkFn :: CCode Name
+rangeMkFn = Nam "range_mk"
+
+taskMkFn :: CCode Name
+taskMkFn = Nam "task_mk"
+
+arrayMkFn :: CCode Name
+arrayMkFn = Nam "array_mk"
+
+tupleMkFn :: CCode Name
+tupleMkFn = Nam "tuple_mk"
+
+closureMkFn :: CCode Name
+closureMkFn = Nam "closure_mk"
+
+closureCallName :: CCode Name
+closureCallName = Nam "closure_call"
+
 closureTraceFn :: CCode Name
 closureTraceFn = Nam "closure_trace"
 
@@ -347,3 +434,54 @@ rangeTypeRecName = Nam $ "range_type"
 
 partyTypeRecName :: CCode Name
 partyTypeRecName = Nam $ "party_type"
+
+encoreCtxName :: CCode Name
+encoreCtxName = Nam "_ctx"
+
+encoreCtxT :: CCode Ty
+encoreCtxT = Typ "pony_ctx_t"
+
+encoreCtxVar :: CCode Lval
+encoreCtxVar = Var "_ctx"
+
+arrayGet :: CCode Name
+arrayGet = Nam "array_get"
+
+arraySet :: CCode Name
+arraySet = Nam "array_set"
+
+arraySize :: CCode Name
+arraySize = Nam "array_size"
+
+tupleSet :: CCode Name
+tupleSet = Nam "tuple_set"
+
+tupleGet :: CCode Name
+tupleGet = Nam "tuple_get"
+
+tupleSetType :: CCode Name
+tupleSetType = Nam "tuple_set_type"
+
+rangeStart :: CCode Name
+rangeStart = Nam "range_start"
+
+rangeStop :: CCode Name
+rangeStop = Nam "range_stop"
+
+rangeStep :: CCode Name
+rangeStep = Nam "range_step"
+
+rangeAssertStep :: CCode Name
+rangeAssertStep = Nam "range_assert_step"
+
+taskAttachFut :: CCode Name
+taskAttachFut = Nam "task_attach_fut"
+
+taskSchedule :: CCode Name
+taskSchedule = Nam "task_schedule"
+
+taskRunner :: CCode Name
+taskRunner = Nam "task_runner"
+
+taskFree :: CCode Name
+taskFree = Nam "task_free"