Skip to content

Commit

Permalink
remove polyfill
Browse files Browse the repository at this point in the history
  • Loading branch information
@pantor
pantor committed Jun 25, 2020
1 parent 10b8ccc commit fc5ab40
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 113 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ dist

doc/html
doc/latex

examples
3 changes: 1 addition & 2 deletions include/inja/bytecode.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ struct Bytecode {

// start loop
// value popped off stack is what is iterated over
// args is index of bytecode after end loop (jumped to if iterable is
// empty)
// args is index of bytecode after end loop (jumped to if iterable is empty)
// immediate value is key name (for maps)
// str is value name
StartLoop,
Expand Down
1 change: 0 additions & 1 deletion include/inja/environment.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "config.hpp"
#include "function_storage.hpp"
#include "parser.hpp"
#include "polyfill.hpp"
#include "renderer.hpp"
#include "string_view.hpp"
#include "template.hpp"
Expand Down
8 changes: 5 additions & 3 deletions include/inja/lexer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ class Lexer {
m_tok_start = m_pos;

again:
if (m_tok_start >= m_in.size())
if (m_tok_start >= m_in.size()) {
return make_token(Token::Kind::Eof);

}

switch (m_state) {
default:
case State::Text: {
Expand Down Expand Up @@ -159,8 +160,9 @@ class Lexer {
Token scan_body(nonstd::string_view close, Token::Kind closeKind, bool trim = false) {
again:
// skip whitespace (except for \n as it might be a close)
if (m_tok_start >= m_in.size())
if (m_tok_start >= m_in.size()) {
return make_token(Token::Kind::Eof);
}
char ch = m_in[m_tok_start];
if (ch == ' ' || ch == '\t' || ch == '\r') {
m_tok_start += 1;
Expand Down
73 changes: 48 additions & 25 deletions include/inja/parser.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,41 @@ class Parser {
m_static(ParserStatic::get_instance()) {}

bool parse_expression(Template &tmpl) {
if (!parse_expression_and(tmpl))
if (!parse_expression_and(tmpl)) {
return false;
if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("or"))
}
if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("or")) {
return true;
}
get_next_token();
if (!parse_expression_and(tmpl))
if (!parse_expression_and(tmpl)) {
return false;
}
append_function(tmpl, Bytecode::Op::Or, 2);
return true;
}

bool parse_expression_and(Template &tmpl) {
if (!parse_expression_not(tmpl))
if (!parse_expression_not(tmpl)) {
return false;
if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("and"))
}
if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("and")) {
return true;
}
get_next_token();
if (!parse_expression_not(tmpl))
if (!parse_expression_not(tmpl)) {
return false;
}
append_function(tmpl, Bytecode::Op::And, 2);
return true;
}

bool parse_expression_not(Template &tmpl) {
if (m_tok.kind == Token::Kind::Id && m_tok.text == static_cast<decltype(m_tok.text)>("not")) {
get_next_token();
if (!parse_expression_not(tmpl))
if (!parse_expression_not(tmpl)) {
return false;
}
append_function(tmpl, Bytecode::Op::Not, 1);
return true;
} else {
Expand All @@ -110,8 +117,9 @@ class Parser {
}

bool parse_expression_comparison(Template &tmpl) {
if (!parse_expression_datum(tmpl))
if (!parse_expression_datum(tmpl)) {
return false;
}
Bytecode::Op op;
switch (m_tok.kind) {
case Token::Kind::Id:
Expand Down Expand Up @@ -142,8 +150,9 @@ class Parser {
return true;
}
get_next_token();
if (!parse_expression_datum(tmpl))
if (!parse_expression_datum(tmpl)) {
return false;
}
append_function(tmpl, op, 2);
return true;
}
Expand All @@ -157,8 +166,9 @@ class Parser {
switch (m_tok.kind) {
case Token::Kind::LeftParen: {
get_next_token();
if (!parse_expression(tmpl))
if (!parse_expression(tmpl)) {
return false;
}
if (m_tok.kind != Token::Kind::RightParen) {
throw_parser_error("unmatched '('");
}
Expand Down Expand Up @@ -197,8 +207,9 @@ class Parser {

if (op != Bytecode::Op::Nop) {
// swap arguments for default(); see comment in RenderTo()
if (op == Bytecode::Op::Default)
if (op == Bytecode::Op::Default) {
std::swap(tmpl.bytecodes.back(), *(tmpl.bytecodes.rbegin() + 1));
}
append_function(tmpl, op, num_args);
return true;
} else {
Expand Down Expand Up @@ -252,17 +263,19 @@ class Parser {
if (bracket_level == 0) {
throw_parser_error("unexpected ']'");
}
--bracket_level;
if (brace_level == 0 && bracket_level == 0)
bracket_level -= 1;
if (brace_level == 0 && bracket_level == 0) {
goto returnJson;
}
break;
case Token::Kind::RightBrace:
if (brace_level == 0) {
throw_parser_error("unexpected '}'");
}
--brace_level;
if (brace_level == 0 && bracket_level == 0)
brace_level -= 1;
if (brace_level == 0 && bracket_level == 0) {
goto returnJson;
}
break;
default:
if (brace_level != 0) {
Expand All @@ -286,15 +299,17 @@ class Parser {
}

bool parse_statement(Template &tmpl, nonstd::string_view path) {
if (m_tok.kind != Token::Kind::Id)
if (m_tok.kind != Token::Kind::Id) {
return false;
}

if (m_tok.text == static_cast<decltype(m_tok.text)>("if")) {
get_next_token();

// evaluate expression
if (!parse_expression(tmpl))
if (!parse_expression(tmpl)) {
return false;
}

// start a new if block on if stack
m_if_stack.emplace_back(static_cast<decltype(m_if_stack)::value_type::jump_t>(tmpl.bytecodes.size()));
Expand All @@ -321,8 +336,9 @@ class Parser {
// pop if stack
m_if_stack.pop_back();
} else if (m_tok.text == static_cast<decltype(m_tok.text)>("else")) {
if (m_if_stack.empty())
if (m_if_stack.empty()) {
throw_parser_error("else without matching if");
}
auto &if_data = m_if_stack.back();
get_next_token();

Expand All @@ -340,8 +356,9 @@ class Parser {
get_next_token();

// evaluate expression
if (!parse_expression(tmpl))
if (!parse_expression(tmpl)) {
return false;
}

// update "previous jump"
if_data.prev_cond_jump = tmpl.bytecodes.size();
Expand All @@ -353,27 +370,31 @@ class Parser {
get_next_token();

// options: for a in arr; for a, b in obj
if (m_tok.kind != Token::Kind::Id)
if (m_tok.kind != Token::Kind::Id) {
throw_parser_error("expected id, got '" + m_tok.describe() + "'");
}
Token value_token = m_tok;
get_next_token();

Token key_token;
if (m_tok.kind == Token::Kind::Comma) {
get_next_token();
if (m_tok.kind != Token::Kind::Id)
if (m_tok.kind != Token::Kind::Id) {
throw_parser_error("expected id, got '" + m_tok.describe() + "'");
}
key_token = std::move(value_token);
value_token = m_tok;
get_next_token();
}

if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("in"))
if (m_tok.kind != Token::Kind::Id || m_tok.text != static_cast<decltype(m_tok.text)>("in")) {
throw_parser_error("expected 'in', got '" + m_tok.describe() + "'");
}
get_next_token();

if (!parse_expression(tmpl))
if (!parse_expression(tmpl)) {
return false;
}

m_loop_stack.push_back(tmpl.bytecodes.size());

Expand Down Expand Up @@ -464,10 +485,12 @@ class Parser {
get_next_token();
switch (m_tok.kind) {
case Token::Kind::Eof:
if (!m_if_stack.empty())
if (!m_if_stack.empty()) {
throw_parser_error("unmatched if");
if (!m_loop_stack.empty())
}
if (!m_loop_stack.empty()) {
throw_parser_error("unmatched for");
}
return;
case Token::Kind::Text:
tmpl.bytecodes.emplace_back(Bytecode::Op::PrintText, m_tok.text, 0u);
Expand Down
40 changes: 0 additions & 40 deletions include/inja/polyfill.hpp
View file

This file was deleted.

2 changes: 2 additions & 0 deletions include/inja/renderer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class Renderer {
ptr = ptr_buffer;
break;
}

json::json_pointer json_ptr(ptr.data());
try {
// first try to evaluate as a loop variable
Expand All @@ -98,6 +99,7 @@ class Renderer {
m_tmp_val = callback(arguments);
return &m_tmp_val;
}

throw RenderError("variable '" + static_cast<std::string>(bc.str) + "' not found");
return nullptr;
}
Expand Down
42 changes: 0 additions & 42 deletions single_include/inja/inja.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2849,48 +2849,6 @@ class Parser {

#endif // INCLUDE_INJA_PARSER_HPP_

// #include "polyfill.hpp"
// Copyright (c) 2019 Pantor. All rights reserved.

#ifndef INCLUDE_INJA_POLYFILL_HPP_
#define INCLUDE_INJA_POLYFILL_HPP_

#if __cplusplus < 201402L

#include <cstddef>
#include <memory>
#include <type_traits>
#include <utility>

namespace stdinja {

template <class T> struct _Unique_if { typedef std::unique_ptr<T> _Single_object; };

template <class T> struct _Unique_if<T[]> { typedef std::unique_ptr<T[]> _Unknown_bound; };

template <class T, size_t N> struct _Unique_if<T[N]> { typedef void _Known_bound; };

template <class T, class... Args> typename _Unique_if<T>::_Single_object make_unique(Args &&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}

template <class T> typename _Unique_if<T>::_Unknown_bound make_unique(size_t n) {
typedef typename std::remove_extent<T>::type U;
return std::unique_ptr<T>(new U[n]());
}

template <class T, class... Args> typename _Unique_if<T>::_Known_bound make_unique(Args &&...) = delete;

} // namespace stdinja

#else

namespace stdinja = std;

#endif // memory */

#endif // INCLUDE_INJA_POLYFILL_HPP_

// #include "renderer.hpp"
// Copyright (c) 2019 Pantor. All rights reserved.

Expand Down

0 comments on commit fc5ab40

Please sign in to comment.