Skip to content

Commit

Permalink
fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
amanuel2 committed Jun 8, 2024
1 parent 250213a commit d40a91a
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 4 deletions.
18 changes: 18 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
cmake_minimum_required(VERSION 3.0)

# Built using Clang 🐐
set(CMAKE_CXX_COMPILER_ID "Clang")
set(CMAKE_C_COMPILER_ID "Clang")

# Find the Clang compiler
find_program(CMAKE_CXX_COMPILER NAMES clang++ clang++-14 clang++-13 clang++-12 clang++-11 clang++-10 clang++-9 clang++-8 clang++-7 clang++-6.0 clang++)
find_program(CMAKE_C_COMPILER NAMES clang clang-14 clang-13 clang-12 clang-11 clang-10 clang-9 clang-8 clang-7 clang-6.0 clang)

# Double Check
if(NOT CMAKE_CXX_COMPILER)
message(FATAL_ERROR "Clang++ not found")
endif()

if(NOT CMAKE_C_COMPILER)
message(FATAL_ERROR "Clang not found")
endif()

project(RiftLang)

# C++17 for now might switch to 20
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<h1>Rift</h1>

[website](https://localhost)
| [![Status](https://github.com/Rift-Org/Rift-Lang/actions/workflows/cmake-single-platform.yml/badge.svg)](https://github.com/Rift-Org/Rift-Lang/actions/workflows/cmake-single-platform.yml)
| [Docs](https://localhost)
| [Discord](https://localhost)
| [Changelog](https://localhost)
Expand Down
1 change: 1 addition & 0 deletions include/ast/expr.hh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <iostream>
#include <stdlib.h>
#include <memory>

typedef rift::scanner::tokens::Token Token;

Expand Down
1 change: 1 addition & 0 deletions include/ast/printer.hh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <string>
#include <vector>
#include "expr.hh"

namespace rift
Expand Down
3 changes: 2 additions & 1 deletion include/scanner/scanner.hh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <stdlib.h>
#include <map>

#include <vector> // Include the necessary header file
#include <unordered_map>
#include <vector>

typedef rift::scanner::tokens::Token Token;
typedef rift::scanner::tokens::Type Type;
Expand Down
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ add_executable(
riftlang
${SOURCES}
)
target_compile_options(riftlang PRIVATE -Wpedantic -Wall -Wextra -Werror)
target_compile_options(riftlang PRIVATE -Wpedantic -Wall -Wextra -Werror -Wmisleading-indentation)

2 changes: 1 addition & 1 deletion lib/ast/printer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using namespace rift::ast;
using namespace rift::ast::Expr;
using vec = std::__1::vector<ExprStr*>;
using vec = std::vector<ExprStr*>;
using string = std::string;
using ExprStr = rift::ast::Expr::Expr<string>;

Expand Down
3 changes: 2 additions & 1 deletion lib/scanner/scanner.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ namespace rift
default:
if (isDigit(c)) num();
else if (isAlpha(c)) identifier();
else rift::error::report(line, "scanToken", "Unorthodox Character");break;
else rift::error::report(line, "scanToken", "Unorthodox Character");
break;
};
}
}
Expand Down

0 comments on commit d40a91a

Please sign in to comment.