Merge pull request #4 from bmizerany/b-header2dynamic

headerTable -> dynamicTable

hpack/hpack.go

@@ -20,28 +20,28 @@ type HeaderField struct {
 // A Decoder is the decoding context for incremental processing of
 // header blocks.
 type Decoder struct {
-	ht     headerTable
+	dt     dynamicTable
 	refSet struct{} // TODO
 	Emit   func(f HeaderField, sensitive bool)
 }
 
-type headerTable []HeaderField
+type dynamicTable []HeaderField
 
-func (s *headerTable) add(f HeaderField) {
+func (s *dynamicTable) add(f HeaderField) {
 	*s = append(*s, f)
 }
 
-func (s *headerTable) at(i int) HeaderField {
+func (s *dynamicTable) at(i int) HeaderField {
 	if i < 1 {
 		panic(fmt.Sprintf("header table index %d too small", i))
 	}
-	ht := *s
-	max := len(ht) + len(staticTable)
+	dt := *s
+	max := len(dt) + len(staticTable)
 	if i > max {
 		panic(fmt.Sprintf("header table index %d too large (max = %d)", i, max))
 	}
-	if i <= len(ht) {
-		return ht[i-1]
+	if i <= len(dt) {
+		return dt[i-1]
 	}
-	return staticTable[i-len(ht)-1]
+	return staticTable[i-len(dt)-1]
 }

hpack/hpack_test.go

@@ -114,18 +114,18 @@ func TestStaticTable(t *testing.T) {
 }
 
 func TestHeaderTableAt(t *testing.T) {
-	var ht headerTable
-	if got, want := ht.at(2), (HeaderField{":method", "GET"}); got != want {
+	var dt dynamicTable
+	if got, want := dt.at(2), (HeaderField{":method", "GET"}); got != want {
 		t.Errorf("at(2) = %q; want %q", got, want)
 	}
-	ht.add(HeaderField{"foo", "bar"})
-	if got, want := ht.at(1), (HeaderField{"foo", "bar"}); got != want {
+	dt.add(HeaderField{"foo", "bar"})
+	if got, want := dt.at(1), (HeaderField{"foo", "bar"}); got != want {
 		t.Errorf("at(1) = %q; want %q", got, want)
 	}
-	if got, want := ht.at(3), (HeaderField{":method", "GET"}); got != want {
+	if got, want := dt.at(3), (HeaderField{":method", "GET"}); got != want {
 		t.Errorf("at(3) = %q; want %q", got, want)
 	}
-	if got, want := ht.at(62), (HeaderField{"www-authenticate", ""}); got != want {
+	if got, want := dt.at(62), (HeaderField{"www-authenticate", ""}); got != want {
 		t.Errorf("at(62) = %q; want %q", got, want)
 	}
 }