From a6038e7474bb73a75b96c475759f7143fe6edb58 Mon Sep 17 00:00:00 2001
From: Nicolas Cannasse <ncannasse@gmail.com>
Date: Thu, 24 Feb 2011 06:58:00 +0000
Subject: [PATCH] fixed issue #2

---
 Test.hx           |  3 ++-
 hscript.hxml      |  8 ++++----
 hscript.hxp       | 10 ----------
 hscript.hxproj    | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 hscript/Parser.hx |  2 +-
 5 files changed, 58 insertions(+), 16 deletions(-)
 delete mode 100644 hscript.hxp
 create mode 100644 hscript.hxproj

diff --git a/Test.hx b/Test.hx
index 8f5c5c5..42c306f 100644
--- a/Test.hx
+++ b/Test.hx
@@ -71,7 +71,8 @@ class Test {
 		test("var i=0; if( i++ > 0 ) i=3; i",1);
 		test("var a = 5/2; a",2.5);
 		test("{ x = 3; x; }", 3);
-		test("{ x : 3, y : {} }.x",3);
+		test("{ x : 3, y : {} }.x", 3);
+		test("function bug(){ \n }\nbug().x", null);
 		trace("Done");
 	}
 
diff --git a/hscript.hxml b/hscript.hxml
index 33bc917..7027c2a 100644
--- a/hscript.hxml
+++ b/hscript.hxml
@@ -1,5 +1,5 @@
-# HScript
--swf9 hscript.swf
+-swf hscript.swf
+-swf-version 9
+-swf-header 800:600:30:FFFFFF
+--flash-strict
 -main Test
--debug
-
diff --git a/hscript.hxp b/hscript.hxp
deleted file mode 100644
index d20eb74..0000000
--- a/hscript.hxp
+++ /dev/null
@@ -1,10 +0,0 @@
-<haxe selected="0">
-  <output name="HScript" mode="swf9" out="hscript.swf" class="Test" lib="" cmd="" main="True" debug="True"></output>
-  <files path="/">
-    <file path="hscript\Bytes.hx" />
-    <file path="hscript\Expr.hx" />
-    <file path="hscript\Interp.hx" />
-    <file path="hscript\Parser.hx" />
-    <file path="Test.hx" />
-  </files>
-</haxe>
\ No newline at end of file
diff --git a/hscript.hxproj b/hscript.hxproj
new file mode 100644
index 0000000..32c69f7
--- /dev/null
+++ b/hscript.hxproj
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <!-- Output SWF options -->
+  <output>
+    <movie disabled="False" />
+    <movie input="" />
+    <movie path="hscript.swf" />
+    <movie fps="30" />
+    <movie width="800" />
+    <movie height="600" />
+    <movie version="9" />
+    <movie background="#FFFFFF" />
+  </output>
+  <!-- Other classes to be compiled into your SWF -->
+  <classpaths>
+    <!-- example: <class path="..." /> -->
+  </classpaths>
+  <!-- Build options -->
+  <build>
+    <option directives="" />
+    <option flashStrict="True" />
+    <option mainClass="Test" />
+    <option enabledebug="False" />
+    <option additional="" />
+  </build>
+  <!-- haxelib libraries -->
+  <haxelib>
+    <!-- example: <library name="..." /> -->
+  </haxelib>
+  <!-- Class files to compile (other referenced classes will automatically be included) -->
+  <compileTargets>
+    <!-- example: <compile path="..." /> -->
+  </compileTargets>
+  <!-- Assets to embed into the output SWF -->
+  <library>
+    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
+  </library>
+  <!-- Paths to exclude from the Project Explorer tree -->
+  <hiddenPaths>
+    <!-- example: <hidden path="..." /> -->
+  </hiddenPaths>
+  <!-- Executed before build -->
+  <preBuildCommand />
+  <!-- Executed after build -->
+  <postBuildCommand alwaysRun="False" />
+  <!-- Other project options -->
+  <options>
+    <option showHiddenPaths="False" />
+    <option testMovie="Default" />
+  </options>
+</project>
\ No newline at end of file
diff --git a/hscript/Parser.hx b/hscript/Parser.hx
index 72a6741..c4b596f 100644
--- a/hscript/Parser.hx
+++ b/hscript/Parser.hx
@@ -116,7 +116,7 @@ class Parser {
 
 	function isBlock(e) {
 		return switch( e ) {
-		case EBlock(_): true;
+		case EBlock(_), EObject(_): true;
 		case EFunction(_,e,_): isBlock(e);
 		case EVar(_,e): e != null && isBlock(e);
 		case EIf(_,e1,e2): if( e2 != null ) isBlock(e2) else isBlock(e1);