fix memory attributes (#45)

libmir · Nov 12, 2023 · b03e3b8 · b03e3b8
1 parent dd8af70
commit b03e3b8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/source/mir/deser/ion.d b/source/mir/deser/ion.d
@@ -68,7 +68,7 @@ template deserializeIon(T, bool annotated = false)
             tableMapBuffer.put(id);
         }
         if (auto exception = deserializeValue!(keys, TableKind.scopeRuntime)(ionValue, value, symbolTable, tableMapBuffer.data, optionalAnnotations))
-            throw exception;
+            throw (() @trusted => cast() exception)();
     }}
 
     /// ditto

diff --git a/source/mir/deser/json.d b/source/mir/deser/json.d
@@ -30,7 +30,7 @@ template deserializeJson(T)
         import mir.deser.ion: deserializeIon;
         import mir.ion.exception: ionException, ionErrorMsg, IonParserMirException;
 
-        mir_json2ion(text, (error, data)
+        auto callback(IonErrorInfo error, scope const ubyte[] data)
         {
             enum nogc = __traits(compiles, (scope ref T value, const(ubyte)[] data)@nogc { deserializeIon!T(value, data); });
             if (error.code)
@@ -45,7 +45,9 @@ template deserializeJson(T)
                 }
             }
             deserializeIon!T(value, data);
-        });
+        }
+
+        mir_json2ion(text, &callback);
     }
 }
 

diff --git a/source/mir/deser/package.d b/source/mir/deser/package.d
@@ -35,13 +35,13 @@ package template hasScoped(T)
         enum hasScoped = false;
 }
 
-IonException deserializeValue_(T)(scope IonDescribedValue data, scope ref T value)
+IonException deserializeValue_(T)(scope IonDescribedValue data, return scope ref T value)
     if (isFirstOrderSerdeType!T)
 {
     return deserializeValueImpl(data, value).ionException;
 }
 
-IonException deserializeValue_(T, P...)(scope IonDescribedValue data, scope ref T value, scope const P p)
+IonException deserializeValue_(T, P...)(scope IonDescribedValue data, return scope ref T value, scope const P p)
     if (isFirstOrderSerdeType!T)
 {
     return deserializeValue_!T(data, value);
@@ -166,7 +166,7 @@ template deserializeValue(string[] symbolTable, TableKind tableKind)
 
     private IonException deserializeValueMember(string member, T)(
         scope IonDescribedValue data,
-        scope ref T value,
+        return scope ref T value,
         scope ref SerdeFlags!T requiredFlags,
         scope RuntimeSymbolTable table,
         scope const(uint)[] tableIndex,
@@ -377,7 +377,7 @@ template deserializeValue(string[] symbolTable, TableKind tableKind)
     +/
     IonException deserializeValue(T, Annotations...)(
         scope IonDescribedValue data,
-        scope ref T value,
+        return scope ref T value,
         scope RuntimeSymbolTable table,
         scope const(uint)[] tableIndex,
         scope Annotations annotations_,
@@ -1234,7 +1234,7 @@ template deserializeValue(string[] symbolTable, TableKind tableKind)
 
     IonException deserializeValue(T, Annotations...)(
         scope IonDescribedValue data,
-        scope ref T value,
+        return scope ref T value,
         scope RuntimeSymbolTable table,
         scope const(uint)[] tableIndex,
         scope Annotations annotations_,
@@ -1512,7 +1512,7 @@ template deserializeValue(string[] symbolTable, TableKind tableKind)
             static if (anySatisfy!(templateOr!(isStringMap, isAssociativeArray, hasLikeStruct, hasFallbackStruct, hasDiscriminatedField), Types))
             {
                 case IonTypeCode.struct_:
-                {                        
+                {
                     static if (anySatisfy!(isStringMap, Types))
                     {
                         alias isMapType = isStringMap;

diff --git a/source/mir/ion/value.d b/source/mir/ion/value.d
@@ -2706,7 +2706,7 @@ const:
 
     ///
     @safe pure nothrow @nogc
-    IonStructWithSymbols withSymbols(return scope const(char[])[] symbolTable) return
+    IonStructWithSymbols withSymbols(return scope const(char[])[] symbolTable) return scope
     {
         return IonStructWithSymbols(this, symbolTable);
     }