UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Poincare: Silent build"

Browse Source
This commit is contained in:
Félix Raimundo
2016-04-04 11:05:32 +02:00
committed by Gerrit
parent 586a850610 6cd646cc98
commit 89647c995d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/simplify/rules_generation/Makefile
View File

@@ -11,11 +11,11 @@ rulegen_objs := $(addprefix $(dir)/,\
$(dir)/rules_parser.cpp: $(dir)/rules_parser.y
@echo "BISON $@"
bison --defines=poincare/src/simplify/rules_generation/rules_tokens.h $< -o $@
@bison --defines=poincare/src/simplify/rules_generation/rules_tokens.h $< -o $@
$(dir)/rules_lexer.cpp: $(dir)/rules_lexer.l $(dir)/rules_parser.cpp
@echo "FLEX $@"
flex -o $@ $<
@flex -o $@ $<
RULEGEN := $(dir)/rulegen
@@ -25,7 +25,7 @@ products += $(rulegen_objs) $(RULEGEN) $(addprefix $(dir)/,\
rules_lexer.cpp\
)
GENERATOR_CXXFLAGS = -std=c++11
GENERATOR_CXXFLAGS = -std=c++11 -Wno-deprecated-register
HOSTCC = clang
HOSTCXX = clang++
@@ -36,4 +36,4 @@ $(rulegen_objs): %.o: %.cpp
$(RULEGEN): $(rulegen_objs)
@echo "HOSTLD $@"
$(HOSTCXX) $(rulegen_objs) -o $@
@$(HOSTCXX) $(rulegen_objs) -o $@

4
poincare/src/simplify/rules_generation/rules_parser.y
View File

@@ -14,7 +14,7 @@
int yylex();
int yyparse(std::vector<Rule *> ** rules);
int yyerror(std::vector<Rule *> ** rules, char *s);
int yyerror(std::vector<Rule *> ** rules, const char *s);
%}
@@ -99,7 +99,7 @@ builder_list:
#include <sstream>
#include <iostream>
int yyerror(std::vector<Rule *> ** rules, char *s) {
int yyerror(std::vector<Rule *> ** rules, const char *s) {
printf("Error: %s\n",s);
return 0;
}