naming conventions act 2: the end

code/queue.lua

@@ -8,7 +8,7 @@ function Queue:new()
 	return o
 end
 
-function Queue:Enqueue(item)
+function Queue:enqueue(item)
 	local elem = {item  = item}
 	if self.head == nil then
 		self.head = elem
@@ -22,12 +22,12 @@ function Queue:Enqueue(item)
 	return
 end
 
-function Queue:Empty()
+function Queue:empty()
 	return self.tail == nil
 end
 
-function Queue:Dequeue()
-	if self:Empty() then
+function Queue:dequeue()
+	if self:empty() then
 		return nil
 	end
 
@@ -41,9 +41,9 @@ function Queue:Dequeue()
 end
 
 local tq1 = Queue:new()
-tq1:Enqueue(5)
+tq1:enqueue(5)
 assert(tq1.head.item == 5)
-assert(tq1:Dequeue() == 5)
+assert(tq1:dequeue() == 5)
 
 -- queue that keeps a rolling tally of its arguments
 AvgQueue = {}
@@ -58,7 +58,7 @@ function AvgQueue:new(n, initial)
 
 	local x = initial / n
 	for _ = 1,n do
-		o.queue:Enqueue(x)
+		o.queue:enqueue(x)
 	end
 
 	setmetatable(o, self)
@@ -66,9 +66,9 @@ function AvgQueue:new(n, initial)
 	return o
 end
 
-function AvgQueue:Push(item)
+function AvgQueue:push(item)
 	local x = item/self.n
-	self.avg = self.avg + x - self.queue:Dequeue()
-	self.queue:Enqueue(x)
+	self.avg = self.avg + x - self.queue:dequeue()
+	self.queue:enqueue(x)
 	return self.avg
 end