Fix broken example files

Author: positively-charged

test/bigint.bcs

@@ -28,33 +28,35 @@ strict namespace BigInt {
 // ==========================================================================
 
 str Add( str a, str b ) {
-   return StrParam( msgbuild: ( msgbuild auto() ) {
+   return buildmsg ( StrParam() ) {
       // Calculate sum.
-      str sum = StrParam( msgbuild: ( msgbuild auto() ) {
-         int i_a = a.length() - 1;
-         int i_b = b.length() - 1;
-         int carry = 0;
-         while ( i_a >= 0 || i_b >= 0 ) {
-            int sum = ( i_a >= 0 ? a[ i_a ] - '0' : 0 ) +
-               ( i_b >= 0 ? b[ i_b ] - '0' : 0 ) + carry;
-            append( d: sum - ( int( sum >= 10 ) * 10 ) );
-            carry = int( sum >= 10 );
-            --i_a;
-            --i_b;
+      str sum = ( auto() ) {
+         return buildmsg ( StrParam() ) {
+            int i_a = a.length() - 1;
+            int i_b = b.length() - 1;
+            int carry = 0;
+            while ( i_a >= 0 || i_b >= 0 ) {
+               int sum = ( i_a >= 0 ? a[ i_a ] - '0' : 0 ) +
+                  ( i_b >= 0 ? b[ i_b ] - '0' : 0 ) + carry;
+               append( d: sum - ( int( sum >= 10 ) * 10 ) );
+               carry = int( sum >= 10 );
+               --i_a;
+               --i_b;
+            }
+            append( c: carry * '1' );
          }
-         append( c: carry * '1' );
-      } );
+      }();
       // Output sum.
       int i = sum.length() - 1;
       while ( i >= 0 ) {
          append( c: sum[ i ] );
          --i;
       }
-   } );
+   }
 }
 
 str Sub( str a, str b ) {
-   return StrParam( msgbuild: ( msgbuild auto() ) {
+   return buildmsg ( StrParam() ) {
       // Negative.
       if ( Lt( a, b ) ) {
          append( c: '-' );
@@ -63,20 +65,22 @@ str Sub( str a, str b ) {
          b = temp_a;
       }
       // Calculate difference.
-      str diff = StrParam( msgbuild: ( msgbuild auto() ) {
-         int i_a = a.length() - 1;
-         int i_b = b.length() - 1;
-         int borrow = 0;
-         while ( i_a >= 0 || i_b >= 0 ) {
-            int digit_a = ( i_a >= 0 ? a[ i_a ] - '0' : 0 );
-            int digit_b = ( i_b >= 0 ? b[ i_b ] - '0' : 0 );
-            append( d: ( digit_a - borrow ) +
-               ( int( digit_a - borrow < digit_b ) * 10 ) - digit_b );
-            borrow = int( digit_a - borrow < digit_b );
-            --i_a;
-            --i_b;
+      str diff = ( auto() ) {
+         return buildmsg ( StrParam() ) {
+            int i_a = a.length() - 1;
+            int i_b = b.length() - 1;
+            int borrow = 0;
+            while ( i_a >= 0 || i_b >= 0 ) {
+               int digit_a = ( i_a >= 0 ? a[ i_a ] - '0' : 0 );
+               int digit_b = ( i_b >= 0 ? b[ i_b ] - '0' : 0 );
+               append( d: ( digit_a - borrow ) +
+                  ( int( digit_a - borrow < digit_b ) * 10 ) - digit_b );
+               borrow = int( digit_a - borrow < digit_b );
+               --i_a;
+               --i_b;
+            }
          }
-      } );
+      }();
       // Output difference.
       int i = diff.length() - 1;
       while ( i >= 1 && diff[ i ] == '0' ) {
@@ -86,7 +90,7 @@ str Sub( str a, str b ) {
          append( c: diff[ i ] );
          --i;
       }
-   } );
+   }
 }
 
 bool Lt( str a, str b ) {
@@ -103,4 +107,4 @@ bool Lt( str a, str b ) {
    }
 }
 
-}
+}

test/functions.bcs

@@ -36,7 +36,7 @@ int StriCmp( str a, str b, int length = -1 ) {
 
 // Get substring.
 str StrMid( str string, int start, int length ) {
-   return StrParam( msgbuild: ( msgbuild auto() ) {
+   return buildmsg ( StrParam() ) {
       if ( start < 0 ) {
          start = 0;
       }
@@ -47,7 +47,7 @@ str StrMid( str string, int start, int length ) {
          append( c: c );
          ++i;
       }
-   } );
+   }
 }
 
 // Get substring, starting at offset 0.
@@ -62,7 +62,7 @@ str StrRight( str string, int length ) {
 
 // Get string as uppercase. Character encoding assumed to be ASCII.
 str StrToUpper( str string ) {
-   return StrParam( msgbuild: ( msgbuild auto() ) {
+   return buildmsg ( StrParam() ) {
       foreach ( auto ch; string ) {
          if ( ch >= 97 && ch <= 122 ) {
             append( c: ch - 32 );
@@ -71,12 +71,12 @@ str StrToUpper( str string ) {
             append( c: ch );
          }
       }
-   } );
+   }
 }
 
 // Get string as lowercase.
 str StrToLower( str string ) {
-   return StrParam( msgbuild: ( msgbuild auto() ) {
+   return buildmsg ( StrParam() ) {
       foreach ( auto ch; string ) {
          if ( ch >= 65 && ch <= 90 ) {
             append( c: ch + 32 );
@@ -85,14 +85,14 @@ str StrToLower( str string ) {
             append( c: ch );
          }
       }
-   } );
+   }
 }
 
 // Supports up to 10 arguments, integer or string.
 void Printf( str format, raw arg1 = 0, raw arg2 = 0, raw arg3 = 0,
    raw arg4 = 0, raw arg5 = 0, raw arg6 = 0, raw arg7 = 0, raw arg8 = 0,
    raw arg9 = 0, raw arg10 = 0 ) {
-   Print( msgbuild: ( msgbuild auto() ) {
+   buildmsg ( Print() ) {
       int num = 0;
       int pos = 0;
       while ( num < 10 ) {
@@ -140,7 +140,7 @@ void Printf( str format, raw arg1 = 0, raw arg2 = 0, raw arg3 = 0,
          ++num;
       }
       done:
-   } );
+   }
 }
 
-}
+}