2.10 release tag

doc/all.hxml

@@ -52,6 +52,7 @@
 
 --next
 -cs all_cs
+-D unsafe
 --no-output
 -xml cs.xml
 -D xmldoc

gencommon.ml

@@ -949,11 +949,19 @@ let dump_descriptor gen name path_s =
   SourceWriter.write w "end modules";
   SourceWriter.newline w;
   (* dump all resources *)
+  (match gen.gcon.main_class with
+    | Some path -> 
+      SourceWriter.write w "begin main";
+      SourceWriter.newline w;
+      SourceWriter.write w (path_s path);
+      SourceWriter.newline w;
+      SourceWriter.write w "end main";
+      SourceWriter.newline w
+	| _ -> ()
+  );
   SourceWriter.write w "begin resources";
   SourceWriter.newline w;
-  Hashtbl.iter (fun name path -> 
-    SourceWriter.write w path;
-    SourceWriter.write w "@";
+  Hashtbl.iter (fun name _ -> 
     SourceWriter.write w name;
     SourceWriter.newline w
   ) gen.gcon.resources;

std/haxe/FastList.hx

@@ -24,7 +24,10 @@
  */
 package haxe;
 
-class FastCell<T> #if (flash9 || cpp) implements haxe.rtti.Generic #end {
+#if (haxe3 && (flash9 || cpp))
+@:generic
+#end
+class FastCell<T> #if (!haxe3 && (flash9 || cpp)) implements haxe.rtti.Generic #end {
 	public var elt : T;
 	public var next : FastCell<T>;
 	public function new(elt,next) { this.elt = elt; this.next = next; }
@@ -47,10 +50,10 @@ private class FastListIterator<T> extends cpp.FastIterator<T>#if !haxe3 , implem
 /**
 	A linked-list of elements. A different class is created for each container used in platforms where it matters
 **/
-#if haxe3 && (flash9 || cpp)
+#if (haxe3 && (flash9 || cpp))
 @:generic
 #end
-class FastList<T> #if !haxe3 && (flash9 || cpp) implements haxe.rtti.Generic #end {
+class FastList<T> #if (!haxe3 && (flash9 || cpp)) implements haxe.rtti.Generic #end {
 
 	public var head : FastCell<T>;
 

typer.ml

@@ -1797,7 +1797,7 @@ and type_expr ctx ?(need_val=true) (e,p) =
 						unify ctx e.etype t p;
 						Some e
 				) in
-				if v.[0] = '$' then error "Variables names starting with a dollar are not allowed" p;
+				if v.[0] = '$' && not ctx.com.display then error "Variables names starting with a dollar are not allowed" p;
 				add_local ctx v t, e
 			with
 				Error (e,p) ->