Changeset ad7a6c9 in mainline for uspace/dist/src/sysel/demos/property.sy

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/dist/src/sysel/demos/property.sy (modified) (7 diffs)

uspace/dist/src/sysel/demos/property.sy

@@ -33 +33 @@
         prop X : int is
                 get is
-                        Builtin.Write("Getting value of X which is ");
-                        Builtin.WriteLine(x);
+                        Console.Write("Getting value of X which is ");
+                        Console.WriteLine(x);
                         return x;
                 end
 
                 set value is
-                        Builtin.Write("Setting value of X to ");
-                        Builtin.WriteLine(value);
+                        Console.Write("Setting value of X to ");
+                        Console.WriteLine(value);
                         x = value;
                 end
+        end
+
+        -- Test accessing property via an unqualified name
+        fun TestUnqualPropAcc() is
+                var i : int;
+
+                X = 1;
+                i = X;
+
+                Console.Write("TestUnqualPropAcc(): Got ");
+                Console.WriteLine(i);
         end
 
@@ -51 +62 @@
         prop self[index : int] : int is
                 get is
-                        Builtin.Write("Getting property with index ");
-                        Builtin.Write(index);
-                        Builtin.Write(" which is ");
-                        Builtin.WriteLine(iprops[index]);
+                        Console.Write("Getting property with index ");
+                        Console.Write(index);
+                        Console.Write(" which is ");
+                        Console.WriteLine(iprops[index]);
 
                         return iprops[index];
@@ -60 +71 @@
 
                 set value is
-                        Builtin.Write("Setting property with index ");
-                        Builtin.Write(index);
-                        Builtin.Write(" to ");
-                        Builtin.WriteLine(value);
+                        Console.Write("Setting property with index ");
+                        Console.Write(index);
+                        Console.Write(" to ");
+                        Console.WriteLine(value);
 
                         iprops[index] = value;
@@ -82 +93 @@
         prop B : Bar is
                 get is
-                        Builtin.WriteLine("Getting B");
+                        Console.WriteLine("Getting B");
                         return bprop;
                 end
                 set value is
-                        Builtin.WriteLine("Setting B");
+                        Console.WriteLine("Setting B");
                         bprop = value;
                 end
@@ -110 +121 @@
                 i = a.X;
 
-                Builtin.Write("Main(): Got ");
-                Builtin.WriteLine(i);
+                Console.Write("Main(): Got ");
+                Console.WriteLine(i);
+
+                a.TestUnqualPropAcc();
 
                 a.iprops = new int[5];
@@ -121 +134 @@
                 i = a[1];
 
-                Builtin.Write("Main(): Got ");
-                Builtin.WriteLine(i);
+                Console.Write("Main(): Got ");
+                Console.WriteLine(i);
 
                 -- Property field access
@@ -132 +145 @@
                 a.bprop = b;
 
-                Builtin.WriteLine(a.bprop.i);
+                Console.WriteLine(a.bprop.i);
                 a.bprop.i = 2;
-                Builtin.WriteLine(a.bprop.i);
+                Console.WriteLine(a.bprop.i);
         end
 end