Merge pull request #177 from tfoleyNV/ir-work

Replace old notion of "intrinsic" operations

1 files changed, 4 insertions, 27 deletions

diff --git a/source/slang/syntax.h b/source/slang/syntax.h
index 3a7d25f6c..2fcfe8d39 100644
--- a/source/slang/syntax.h
+++ b/source/slang/syntax.h
@@ -2,10 +2,11 @@
 #define RASTER_RENDERER_SYNTAX_H
 
 #include "../core/basic.h"
-#include "Lexer.h"
-#include "Profile.h"
+#include "ir.h"
+#include "lexer.h"
+#include "profile.h"
 
-#include "../../Slang.h"
+#include "../../slang.h"
 
 #include <assert.h>
 
@@ -80,15 +81,6 @@ namespace Slang
 #include "syntax-defs.h"
 #include "object-meta-end.h"
 
-    enum class IntrinsicOp
-    {
-        Unknown = 0,
-#define INTRINSIC(NAME) NAME,
-#include "intrinsic-defs.h"
-    };
-
-    IntrinsicOp findIntrinsicOp(char const* name);
-
     // Helper type for pairing up a name and the location where it appeared
     struct NameLoc
     {
@@ -243,21 +235,6 @@ namespace Slang
         FilteredModifierList<Modifier>::Iterator end() { return FilteredModifierList<Modifier>::Iterator(nullptr); }
     };
 
-
-    enum class BaseType
-    {
-        // Note(tfoley): These are ordered in terms of promotion rank, so be vareful when messing with this
-
-        Void = 0,
-        Bool,
-        Int,
-        UInt,
-        UInt64,
-        Half,
-        Float,
-        Double,
-    };
-
     class NamedExpressionType;
     class GenericDecl;
     class ContainerDecl;