Sync changes to upstream

Author: dsereni

Makefile

@@ -118,6 +118,7 @@ build-flowlib-archive:
 
 copy-flow-files: build-flow $(FILES_TO_COPY)
 	mkdir -p bin
+	cp -r examples bin/examples
 ifeq ($(OS), Linux)
 	objcopy --add-section flowlib=bin/flowlib.tar.gz _build/src/flow.native bin/flow
 else

examples/01_HelloWorld/.flowconfig

@@ -0,0 +1,8 @@
+/* @flow */
+
+function foo(x) {
+  return x*10;
+}
+
+// This is fine, because we're passing a number now
+foo(10);

examples/01_HelloWorld/answer/hello.js

@@ -0,0 +1,7 @@
+/* @flow */
+
+function foo(x) {
+  return x*10;
+}
+
+foo("Hello, world!");

examples/01_HelloWorld/hello.js

@@ -0,0 +1,8 @@
+/* @flow */
+
+// Changing the return type to number fixes the error
+function foo(x: string, y: number): number {
+  return x.length * y;
+}
+
+foo("Hello", 42);

examples/02_TypeAnnotations/.flowconfig

@@ -0,0 +1,7 @@
+/* @flow */
+
+function foo(x: string, y: number): string {
+  return x.length * y;
+}
+
+foo("Hello", 42);

examples/02_TypeAnnotations/answer/type_annotations.js

@@ -0,0 +1,11 @@
+/* @flow */
+
+function length(x) {
+  if (x !== null) {
+    return x.length;
+  } else {
+    return 0;
+  }
+}
+
+var total = length("Hello") + length(null);

examples/02_TypeAnnotations/type_annotations.js

@@ -0,0 +1,7 @@
+/* @flow */
+
+function length(x) {
+  return x.length;
+}
+
+var total = length("Hello") + length(null);

examples/03_Null/.flowconfig

@@ -0,0 +1,11 @@
+/* @flow */
+
+function total(numbers: Array<number>) {
+  var result = 0;
+  for (var i = 0; i < numbers.length; i++) {
+    result += numbers[i];
+  }
+  return result;
+}
+
+total([1, 2, 3, 4]);

examples/03_Null/answer/nulls.js

@@ -0,0 +1,11 @@
+/* @flow */
+
+function total(numbers: Array<number>) {
+  var result = 0;
+  for (var i = 0; i < numbers.length; i++) {
+    result += numbers[i];
+  }
+  return result;
+}
+
+total([1, 2, 3, "Hello"]);

examples/03_Null/nulls.js

@@ -0,0 +1,11 @@
+/* @flow */
+
+function foo(x) {
+  if (typeof(x) === 'string') {
+    return x.length;
+  } else {
+    return x;
+  }
+}
+
+var res = foo("Hello") + foo(42);

examples/04_Arrays/.flowconfig

@@ -0,0 +1,7 @@
+/* @flow */
+
+function foo(x) {
+  return x.length;
+}
+
+var res = foo("Hello") + foo(42);