Changeset 9a83ccd

Timestamp:

Nov 11, 2019, 2:41:41 PM (5 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

44f41997

Parents:

8bbdfdd

git-author:

Dmitry Kobets <dkobets@…> (10/04/19 14:20:38)

git-committer:

Dmitry Kobets <dkobets@…> (11/11/19 14:41:41)

Message:

Add sout override for vec2

Files:

• libcfa/src/vector.hfa (modified) (2 diffs)
• main.cfa (modified) (1 diff)

libcfa/src/vector.hfa

@@ -1 +1 @@
 #pragma once
-#include <math.h>
-
+#include "math.hfa"
+#include <iostream.hfa>
 
 //---------------------- Vector Types ----------------------
 // TODO: make generic, as per glm
+
 
 struct vec2 {
@@ -10 +11 @@
 };
 
-//---------------------- Geometric Functions ----------------------
-// These functions implement the Geometric Functions section of GLSL
+void ?{}( vec2 & v, float x, float y) {
+    v.[x, y] = [x, y];
+}
 
-static inline float dot(const vec2& v, const vec2& u) {
-    return v.x * u.x + v.y * u.y;
+forall( dtype ostype | ostream( ostype ) ) {
+    ostype & ?|?( ostype & os, const vec2& v) with (v) {
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        fmt( os, "<%g,%g>", x, y);
+        return os;
+    }
+    void ?|?( ostype & os, const vec2 v ) {
+        (ostype &)(os | v); ends( os );
+    }
+}
+
+vec2 ?-?(const vec2& u, const vec2& v) {
+    return [u.x - v.x, u.y - v.y];
+}
+
+/* //---------------------- Geometric Functions ---------------------- */
+/* // These functions implement the Geometric Functions section of GLSL */
+
+static inline float dot(const vec2& u, const vec2& v) {
+    return u.x * v.x + u.y * v.y;
 }
 

main.cfa

@@ +1 @@
+/* #include <iostream.hfa> */
 #include <fstream.hfa>
-#include <vector.hfa>
+#include "libcfa/src/vector.hfa"
+
+/* [float, float] tuple(const vec2& v) { */
+/*     return [v.x, v.y]; */
+/* } */
+
+
+
+
 
 int main() {
     vec2 v1 = {1,2};
-    sout | length(v1);
-
-    vec2 v2 = {1,2};
-    sout | dot(v1, v2);
+    sout | true;
+    sout | v1;
+    sout | "wot";
+    sout | ((vec2){1,2} - (vec2){3,2});
+    sout | "a" | "b";
+    /* sout | nlOff; */
+    /* sout | sepOff; */
+    /* sout | nlOff; */
+    /* #<{(| sout | nlOff; |)}># */
+    /*  */
+    /* vec2 v1 = {1,2}; */
+    /* sout | "w" | 2.2 | "at" | v1; */
+    /* sout | length(v1); */
+    /*  */
+    /* vec2 v2 = {1,1}; */
+    /* sout | dot(v1, v2); */
+    /*  */
+    /* sout | (v2 - v1) | " " | (v1 - v2); */
 }