From: Jean Privat <jean@pryen.org>
Date: Tue, 15 Feb 2011 13:52:54 +0000 (-0500)
Subject: Merge branch 'various-fixes' into next
X-Git-Tag: v0.4~9
X-Git-Url: http://nitlanguage.org?hp=eff34adbd160716365655a25851a2019ba266d7d

Merge branch 'various-fixes' into next
---

diff --git a/lib/standard/collection/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit
index a94c7b6..b6e734a 100644
--- a/lib/standard/collection/abstract_collection.nit
+++ b/lib/standard/collection/abstract_collection.nit
@@ -85,7 +85,7 @@ special Collection[E]
 	redef fun length
 	do
 		var nb = 0
-		for i in self do nb += nb
+		for i in self do nb += 1 
 		return nb
 	end
 
diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 1f50959..8726fab 100644
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -1264,7 +1264,7 @@ special TablesCapable
 			result = get_token
 		end
 		_token = null
-		return result.as(not null)
+		return result
 	end
 
 	# Get a token, or null if it is discarded
@@ -1654,9 +1654,7 @@ special TablesCapable
 					end
 				end
 			end
-			if false then break # FIXME remove once unreach loop exits are in c_src
 		end
-		return null # FIXME remove once unreach loop exits are in c_src
 	end
 
 	# Read the next character.
diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index a789e90..84bf367 100644
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -122,7 +122,7 @@ special TablesCapable
 				else
 					action_type = parser_action(state, subindex+1)
 					action_value = parser_action(state, subindex+2)
-					high = low -1 # break
+					break
 				end
 			end
 
@@ -143,9 +143,7 @@ special TablesCapable
 				var node = new Start(null, node2)
 				return node
 			end
-			if false then break # FIXME remove once unreach loop exits are in c_src
 		end
-		abort # FIXME remove once unreach loop exits are in c_src
 	end
 
 	var _reduce_table: Array[ReduceAction]
diff --git a/src/parser/xss/lexer.xss b/src/parser/xss/lexer.xss
index a8fa706..2eb31da 100644
--- a/src/parser/xss/lexer.xss
+++ b/src/parser/xss/lexer.xss
@@ -86,7 +86,7 @@ $ end foreach
 			result = get_token
 		end
 		_token = null
-		return result.as(not null)
+		return result
 	end
 
 	# Get a token, or null if it is discarded
@@ -215,9 +215,7 @@ $ end foreach
 					end
 				end
 			end
-			if false then break # FIXME remove once unreach loop exits are in c_src
 		end
-		return null # FIXME remove once unreach loop exits are in c_src
 	end
 
 	# Read the next character.
diff --git a/src/parser/xss/parser.xss b/src/parser/xss/parser.xss
index 63180cf..8d4d6ce 100644
--- a/src/parser/xss/parser.xss
+++ b/src/parser/xss/parser.xss
@@ -135,7 +135,7 @@ special TablesCapable
 				else
 					action_type = parser_action(state, subindex+1)
 					action_value = parser_action(state, subindex+2)
-					high = low -1 # break
+					break
 				end
 			end
 
@@ -156,9 +156,7 @@ special TablesCapable
 				var node = new Start(null, node2)
 				return node
 			end
-			if false then break # FIXME remove once unreach loop exits are in c_src
 		end
-		abort # FIXME remove once unreach loop exits are in c_src
 	end
 
 	var _reduce_table: Array[ReduceAction]