Cleanup in http_utils.dart.

runtime/bin/http_utils.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class _HttpUtils {
   static String decodeUrlEncodedString(String urlEncoded) {
     // First check the string for any encoding.
     int index = 0;
     bool encoded = false;
     while (!encoded && index < urlEncoded.length) {
@@ skipping 76 matching lines @@
   // wkday        = "Mon" | "Tue" | "Wed"
   //              | "Thu" | "Fri" | "Sat" | "Sun"
   // weekday      = "Monday" | "Tuesday" | "Wednesday"
   //              | "Thursday" | "Friday" | "Saturday" | "Sunday"
   // month        = "Jan" | "Feb" | "Mar" | "Apr"
   //              | "May" | "Jun" | "Jul" | "Aug"
   //              | "Sep" | "Oct" | "Nov" | "Dec"
 
   // Format as RFC 1123 date.
   static String formatDate(Date date) {
-    List wkday = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-    List month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+    List wkday = const ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];

[Mads Ager (google), 2012/09/05 08:52:51]

Mark the wkday as const as well?

const List wkday = const [...];

?

[Anders Johnsen, 2012/09/05 09:09:46]

Got'ya, done.

+    List month = const ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
 
     Date d = date.toUtc();
     StringBuffer sb = new StringBuffer();
     sb.add(wkday[d.weekday - 1]);
     sb.add(", ");
     sb.add(d.day.toString());
     sb.add(" ");
     sb.add(month[d.month - 1]);
     sb.add(" ");
     sb.add(d.year.toString());
     d.hour < 9 ? sb.add(" 0") : sb.add(" ");
     sb.add(d.hour.toString());
     d.minute < 9 ? sb.add(":0") : sb.add(":");
     sb.add(d.minute.toString());
     d.second < 9 ? sb.add(":0") : sb.add(":");
     sb.add(d.second.toString());
     sb.add(" GMT");
     return sb.toString();
   }
 
   static Date parseDate(String date) {
     final int SP = 32;
-    List wkdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-    List weekdays = ["Monday", "Tuesday", "Wednesday", "Thursday",
-                     "Friday", "Saturday", "Sunday"];
-    List months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-    List wkdaysLowerCase = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
-    List weekdaysLowerCase = ["monday", "tuesday", "wednesday", "thursday",
-                              "friday", "saturday", "sunday"];
-    List monthsLowerCase = ["jan", "feb", "mar", "apr", "may", "jun",
-                            "jul", "aug", "sep", "oct", "nov", "dec"];
+    List wkdays = const ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+    List weekdays = const ["Monday", "Tuesday", "Wednesday", "Thursday",
+                           "Friday", "Saturday", "Sunday"];
+    List months = const ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+    List wkdaysLowerCase =
+        const ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
+    List weekdaysLowerCase = const ["monday", "tuesday", "wednesday",
+                                    "thursday", "friday", "saturday", "sunday"];
+    List monthsLowerCase = const ["jan", "feb", "mar", "apr", "may", "jun",
+                                  "jul", "aug", "sep", "oct", "nov", "dec"];
 
     final int formatRfc1123 = 0;
     final int formatRfc850 = 1;
     final int formatAsctime = 2;
 
     int index = 0;
     String tmp;
     int format;
 
     void expect(String s) {
@@ skipping 95 matching lines @@
       minutes = expectNum(":");
       seconds = expectNum(" ");
       expect("GMT");
     }
     expectEnd();
     return new Date(
         year, month + 1, day, hours, minutes, seconds, 0, isUtc: true);
   }
 
   static Date parseCookieDate(String date) {
-    List monthsLowerCase = ["jan", "feb", "mar", "apr", "may", "jun",
-                            "jul", "aug", "sep", "oct", "nov", "dec"];
+    List monthsLowerCase = const ["jan", "feb", "mar", "apr", "may", "jun",
+                                  "jul", "aug", "sep", "oct", "nov", "dec"];
 
     int position = 0;
 
     void error() {
       throw new HttpException("Invalid cookie date $date");
     }
 
     bool isEnd() {
       return position == date.length;
     }
@@ skipping 60 matching lines @@
         dayOfMonthStr = token;
       } else if (monthStr === null && getMonth(token) >= 0) {
         monthStr = token;
       } else if (yearStr === null && token.length >= 2 &&
                  isDigit(token[0]) && isDigit(token[1])) {
         yearStr = token;
       }
     }
 
     if (timeStr === null || dayOfMonthStr === null ||
-        monthStr === null || yearStr === null) error();
+        monthStr === null || yearStr === null) {
+      error();
+    }
 
     int year = toInt(yearStr);
     if (year >= 70 && year <= 99) year += 1900;
     else if (year >= 0 && year <= 69) year += 2000;
     if (year < 1601) error();
 
     int dayOfMonth = toInt(dayOfMonthStr);
     if (dayOfMonth < 1 || dayOfMonth > 31) error();
 
     int month = getMonth(monthStr) + 1;
 
     var timeList = timeStr.split(":");
     if (timeList.length !== 3) error();
     int hour = toInt(timeList[0]);
     int minute = toInt(timeList[1]);
     int second = toInt(timeList[2]);
     if (hour > 23) error();
     if (minute > 59) error();
     if (second > 59) error();
 
     return new Date(year, month, dayOfMonth, hour, minute, second, 0, true);
   }
 }