HashMap -> HeaderMap

joshthecoder · joshthecoder · commit 694de2614b68 · 2010-02-02T12:38:50.000-06:00
diff --git a/examples/dispatch.ooc b/examples/dispatch.ooc
@@ -2,11 +2,10 @@ use web, fastcgi
 
 import web/[Application, Dispatcher]
 import fastcgi/Server
-import structs/HashMap
 
 
 RootApplication: class extends Application {
-    sendHeaders: func(headers: HashMap<String>) {
+    sendHeaders: func(headers: HeaderMap) {
         headers["Content-type"] = "text/plain"
     }
 }
diff --git a/examples/hello.ooc b/examples/hello.ooc
@@ -2,7 +2,6 @@ use web, fastcgi
 
 import web/[Application, Request]
 import fastcgi/Server
-import structs/HashMap
 
 
 HelloApplication: class extends Application {
@@ -12,7 +11,7 @@ HelloApplication: class extends Application {
         "Request remote addr: %s port %d" format(request remoteAddress, request remotePort) println()
     }
 
-    sendHeaders: func(headers: HashMap<String>) {
+    sendHeaders: func(headers: HeaderMap) {
         headers["Content-type"] = "text/html"
     }
 
diff --git a/web/Application.ooc b/web/Application.ooc
@@ -7,11 +7,31 @@ ResponseWriter: abstract class {
     flush: abstract func
 }
 
+HeaderMap: class extends HashMap<String> {
+    init: func ~headermap {
+        init(1)
+    }
+
+    init: func ~headermapWithCapacity (capacity: UInt) {
+        T = String
+        super(capacity)
+    }
+}
+
+operator [] <T> (map: HeaderMap, key: String) -> T {
+    map get(key)
+}
+
+operator []= <T> (map: HeaderMap, key: String, value: T) {
+    map put(key, value)
+}
+
+
 Application: class {
     request: Request
 
     parseRequest: func {}
-    sendHeaders: func(headers: HashMap<String>) {}
+    sendHeaders: func(headers: HeaderMap) {}
     sendResponse: func(response: ResponseWriter) {}
 }
 
diff --git a/web/Dispatcher.ooc b/web/Dispatcher.ooc
@@ -1,6 +1,6 @@
 use web
 import web/Application
-import structs/[LinkedList, HashMap]
+import structs/LinkedList
 
 
 /**
@@ -21,7 +21,7 @@ Dispatcher: class extends Application {
         }
     }
 
-    sendHeaders: func(headers: HashMap<String>) {
+    sendHeaders: func(headers: HeaderMap) {
         for (app: Application in applications) {
             app sendHeaders(headers)
         }

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@ use web, fastcgi`
`2`	`2`
`3`	`3`	`import web/[Application, Dispatcher]`
`4`	`4`	`import fastcgi/Server`
`5`		`-import structs/HashMap`
`6`	`5`
`7`	`6`
`8`	`7`	`RootApplication: class extends Application {`
`9`		`- sendHeaders: func(headers: HashMap<String>) {`
	`8`	`+ sendHeaders: func(headers: HeaderMap) {`
`10`	`9`	`headers["Content-type"] = "text/plain"`
`11`	`10`	`}`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ use web, fastcgi`
`2`	`2`
`3`	`3`	`import web/[Application, Request]`
`4`	`4`	`import fastcgi/Server`
`5`		`-import structs/HashMap`
`6`	`5`
`7`	`6`
`8`	`7`	`HelloApplication: class extends Application {`
`@@ -12,7 +11,7 @@ HelloApplication: class extends Application {`
`12`	`11`	`"Request remote addr: %s port %d" format(request remoteAddress, request remotePort) println()`
`13`	`12`	`}`
`14`	`13`
`15`		`- sendHeaders: func(headers: HashMap<String>) {`
	`14`	`+ sendHeaders: func(headers: HeaderMap) {`
`16`	`15`	`headers["Content-type"] = "text/html"`
`17`	`16`	`}`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`use web`
`2`	`2`	`import web/Application`
`3`		`-import structs/[LinkedList, HashMap]`
	`3`	`+import structs/LinkedList`
`4`	`4`
`5`	`5`
`6`	`6`	`/**`
`@@ -21,7 +21,7 @@ Dispatcher: class extends Application {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- sendHeaders: func(headers: HashMap<String>) {`
	`24`	`+ sendHeaders: func(headers: HeaderMap) {`
`25`	`25`	`for (app: Application in applications) {`
`26`	`26`	`app sendHeaders(headers)`
`27`	`27`	`}`