Merge pull request #1107 from sm4rk0/patch-1

[haxe/en] Few cosmetic fixes
This commit is contained in:
ven 2015-05-20 14:36:23 +02:00
commit 22aae18226

View File

@ -340,7 +340,7 @@ class LearnHaxe3{
// (more on ranges later as well) // (more on ranges later as well)
var n = ['foo', 'bar', 'baz']; var n = ['foo', 'bar', 'baz'];
for (val in 0...n.length){ for (val in 0...n.length){
trace(val + " is the value for val (an index for m)"); trace(val + " is the value for val (an index for n)");
} }
@ -375,7 +375,7 @@ class LearnHaxe3{
case "rex" : favorite_thing = "shoe"; case "rex" : favorite_thing = "shoe";
case "spot" : favorite_thing = "tennis ball"; case "spot" : favorite_thing = "tennis ball";
default : favorite_thing = "some unknown treat"; default : favorite_thing = "some unknown treat";
// case _ : "some unknown treat"; // same as default // case _ : favorite_thing = "some unknown treat"; // same as default
} }
// The "_" case above is a "wildcard" value // The "_" case above is a "wildcard" value
// that will match anything. // that will match anything.
@ -397,7 +397,7 @@ class LearnHaxe3{
// if statements // if statements
var k = if (true) 10 else 20; var k = if (true) 10 else 20;
trace("K equals ", k); // outputs 10 trace("k equals ", k); // outputs 10
var other_favorite_thing = switch(my_dog_name) { var other_favorite_thing = switch(my_dog_name) {
case "fido" : "teddy"; case "fido" : "teddy";
@ -495,8 +495,10 @@ class LearnHaxe3{
// foo_instance.public_read = 4; // this will throw an error if uncommented: // foo_instance.public_read = 4; // this will throw an error if uncommented:
// trace(foo_instance.public_write); // as will this. // trace(foo_instance.public_write); // as will this.
trace(foo_instance + " is the value for foo_instance"); // calls the toString method // calls the toString method:
trace(foo_instance.toString() + " is the value for foo_instance.toString()"); // same thing trace(foo_instance + " is the value for foo_instance");
// same thing:
trace(foo_instance.toString() + " is the value for foo_instance.toString()");
/* /*
@ -524,8 +526,8 @@ class LearnHaxe3{
*/ */
class FooClass extends BarClass implements BarInterface{ class FooClass extends BarClass implements BarInterface{
public var public_any:Int; // public variables are accessible anywhere public var public_any:Int; // public variables are accessible anywhere
public var public_read (default,null): Int; // use this style to only enable public read public var public_read (default, null): Int; // enable only public read
public var public_write (null, default): Int; // or public write public var public_write (null, default): Int; // or only public write
public var property (get, set): Int; // use this style to enable getters/setters public var property (get, set): Int; // use this style to enable getters/setters
// private variables are not available outside the class. // private variables are not available outside the class.
@ -534,9 +536,10 @@ class FooClass extends BarClass implements BarInterface{
// a public constructor // a public constructor
public function new(arg:Int){ public function new(arg:Int){
super(); // call the constructor of the parent object, since we extended BarClass // call the constructor of the parent object, since we extended BarClass:
super();
this.public_any= 0; this.public_any = 0;
this._private = arg; this._private = arg;
} }