Changeset e99e43f for examples/ArrayN.c

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• examples/ArrayN.c (modified) (2 diffs)

examples/ArrayN.c

@@ -7 +7 @@
 
 forall(otype index_t)
-index_t offset_to_index(unsigned offset, index_t size)
-{
+index_t offset_to_index(unsigned offset, index_t size) {
     return [offset / size.0, offset % size.1];
 }
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
     unsigned x = 0, y = 0, i = 0;
     unsigned sx = 4, sy = 4;
@@ -20 +18 @@
     [x, y] = offset_to_index(6, [sx, sy]);
 
-    sout | x | ' ' | y | endl;
+    sout | x | ' ' | y;
 
     return 0;