Update samples

dlang · May 14, 2014 · f370f35 · f370f35
1 parent f7babe2
commit f370f35
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/samples/dhry.d b/samples/dhry.d
@@ -579,7 +579,7 @@ void main()
     printf ("        should be:   %d\n", 2);
     printf ("  Int_Comp:          %d\n", Ptr_Glob.variant.var_1.Int_Comp);
     printf ("        should be:   %d\n", 17);
-    printf ("  Str_Comp:          %.*s\n", Ptr_Glob.variant.var_1.Str_Comp);
+    printf ("  Str_Comp:          %.*s\n", Ptr_Glob.variant.var_1.Str_Comp.ptr);
     printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
     printf ("Next_Ptr_Glob.\n");
     printf ("  Ptr_Comp:          %d\n", cast(int) Next_Ptr_Glob.Ptr_Comp);
@@ -590,7 +590,7 @@ void main()
     printf ("        should be:   %d\n", 1);
     printf ("  Int_Comp:          %d\n", Next_Ptr_Glob.variant.var_1.Int_Comp);
     printf ("        should be:   %d\n", 18);
-    printf ("  Str_Comp:          %.*s\n", Next_Ptr_Glob.variant.var_1.Str_Comp);
+    printf ("  Str_Comp:          %.*s\n", Next_Ptr_Glob.variant.var_1.Str_Comp.ptr);
     printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
     printf ("Int_1_Loc:           %d\n", Int_1_Loc);
     printf ("        should be:   %d\n", 5);
@@ -600,9 +600,9 @@ void main()
     printf ("        should be:   %d\n", 7);
     printf ("Enum_Loc:            %d\n", Enum_Loc);
     printf ("        should be:   %d\n", 1);
-    printf ("Str_1_Loc:           %.*s\n", Str_1_Loc);
+    printf ("Str_1_Loc:           %.*s\n", Str_1_Loc.ptr);
     printf ("        should be:   DHRYSTONE PROGRAM, 1'ST STRING\n");
-    printf ("Str_2_Loc:           %.*s\n", Str_2_Loc);
+    printf ("Str_2_Loc:           %.*s\n", Str_2_Loc.ptr);
     printf ("        should be:   DHRYSTONE PROGRAM, 2'ND STRING\n");
     printf ("\n");
 
@@ -632,7 +632,7 @@ void main()
 
         fprintf(Ap, "\n");
         fprintf(Ap, "Dhrystone Benchmark, Version 2.1 (Language: D)\n");
-        fprintf(Ap, "%.*s\n", Reg_Define);
+        fprintf(Ap, "%.*s\n", Reg_Define.ptr);
         fprintf(Ap, "Microseconds for one loop: %7.1lf\n", Microseconds);
         fprintf(Ap, "Dhrystones per second: %10.1lf\n", Dhrystones_Per_Second);
         fprintf(Ap, "VAX MIPS rating: %10.3lf\n", Vax_Mips);

diff --git a/samples/htmlget.d b/samples/htmlget.d
@@ -46,7 +46,7 @@ int main(string[] args)
     else
     {
         domain = url[0 .. i];
-        url    = url[i .. url.length];
+        url    = url[i .. $];
     }
 
     ushort port;
@@ -58,7 +58,7 @@ int main(string[] args)
     }
     else
     {
-        port   = to!ushort(domain[i + 1 .. domain.length]);
+        port   = to!ushort(domain[i + 1 .. $]);
         domain = domain[0 .. i];
     }
 
@@ -92,7 +92,7 @@ int main(string[] args)
         if (line.length > CONTENT_TYPE_NAME.length &&
             !icmp(CONTENT_TYPE_NAME, line[0 .. CONTENT_TYPE_NAME.length]))
         {
-            auto type = line[CONTENT_TYPE_NAME.length .. line.length];
+            auto type = line[CONTENT_TYPE_NAME.length .. $];
 
             if (type.length <= 5 || icmp("text/", type[0 .. 5]))
                 throw new Exception("URL is not text");

diff --git a/samples/wc2.d b/samples/wc2.d
@@ -46,7 +46,7 @@ int main (string[] args)
             }
             if (inword)
             {
-                auto w = input[wstart .. input.length];
+                auto w = input[wstart .. $];
                 dictionary[w]++;
             }
         }