Skip to content

Commit

Permalink
Merge pull request #2 from stan-dev/feature/remove-popen-from-utility
Browse files Browse the repository at this point in the history
updating utility to use an ifdef instead of popen
syclik committed Mar 8, 2014

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents b4a6cd9 + beed77b commit 78f485f
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions src/test/utility.hpp
Original file line number Diff line number Diff line change
@@ -23,14 +23,11 @@ int count_matches(const std::string& target,
* @return '\' for Windows, '/' otherwise.
*/
char get_path_separator() {
static char path_separator = 0;
if (path_separator == 0) {
FILE *in;
if(!(in = popen("make path_separator --no-print-directory", "r")))
throw std::runtime_error("\"make path_separator\" has failed.");
path_separator = fgetc(in);
pclose(in);
}
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
static char path_separator = '\\';
#else
static char path_separator = '/';
#endif
return path_separator;
}

2 changes: 1 addition & 1 deletion stan
Submodule stan updated 75 files
+4 −0 make/os_linux
+5 −0 make/os_mac
+3 −1 makefile
+50 −4 src/stan/gm/ast_def.cpp
+1 −1 src/stan/gm/generator.hpp
+4 −6 src/stan/gm/grammars/iterator_typedefs.hpp
+134 −15 src/stan/gm/grammars/program_grammar_def.hpp
+13 −12 src/stan/gm/grammars/statement_2_grammar_def.hpp
+40 −34 src/stan/gm/grammars/statement_grammar_def.hpp
+88 −86 src/stan/gm/grammars/term_grammar_def.hpp
+0 −5 src/stan/gm/grammars/var_decls_grammar.hpp
+92 −91 src/stan/gm/grammars/var_decls_grammar_def.hpp
+35 −60 src/stan/gm/parser.hpp
+8 −0 src/test/test-models/reference/conditional_condition_bad_1.stan
+11 −0 src/test/test-models/reference/conditional_condition_bad_2.stan
+11 −0 src/test/test-models/reference/validate_add_expression_dimss_bad.stan
+10 −0 src/test/test-models/reference/validate_add_var_bad1.stan
+7 −0 src/test/test-models/reference/validate_add_var_bad2.stan
+10 −0 src/test/test-models/reference/validate_allow_sample_bad1.stan
+10 −0 src/test/test-models/reference/validate_allow_sample_bad2.stan
+10 −0 src/test/test-models/reference/validate_allow_sample_bad3.stan
+7 −0 src/test/test-models/reference/validate_int_expr2_bad1.stan
+7 −0 src/test/test-models/reference/validate_int_expr2_bad2.stan
+7 −0 src/test/test-models/reference/validate_int_expr2_bad3.stan
+7 −0 src/test/test-models/reference/validate_int_expr2_bad4.stan
+10 −0 src/test/test-models/reference/validate_logical_negate_expr_bad.stan
+10 −0 src/test/test-models/reference/validate_set_double_range_lower_bad1.stan
+10 −0 src/test/test-models/reference/validate_set_double_range_lower_bad2.stan
+10 −0 src/test/test-models/reference/validate_set_double_range_upper_bad1.stan
+10 −0 src/test/test-models/reference/validate_set_double_range_upper_bad2.stan
+10 −0 src/test/test-models/reference/validate_set_fun_type_named_bad1.stan
+10 −0 src/test/test-models/reference/validate_set_int_range_lower_bad1.stan
+10 −0 src/test/test-models/reference/validate_set_int_range_lower_bad2.stan
+10 −0 src/test/test-models/reference/validate_set_int_range_lower_bad3.stan
+10 −0 src/test/test-models/reference/validate_set_int_range_upper_bad1.stan
+10 −0 src/test/test-models/reference/validate_set_int_range_upper_bad2.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad1.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad10.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad11.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad12.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad13.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad2.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad3.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad4.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad5.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad6.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad7.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad8.stan
+19 −0 src/test/test-models/reference/validate_validate_int_expr_bad9.stan
+12 −0 src/test/test-models/syntax-only/conditional_condition_good.stan
+16 −0 src/test/test-models/syntax-only/validate_add_expression_dimss_good.stan
+77 −0 src/test/test-models/syntax-only/validate_add_var_good.stan
+30 −0 src/test/test-models/syntax-only/validate_division_good.stan
+10 −0 src/test/test-models/syntax-only/validate_division_int_warning.stan
+22 −0 src/test/test-models/syntax-only/validate_elt_division_good.stan
+22 −0 src/test/test-models/syntax-only/validate_elt_multiplication_good.stan
+7 −0 src/test/test-models/syntax-only/validate_int_expr2_good.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning1.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning2.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning3.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning4.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning5.stan
+6 −0 src/test/test-models/syntax-only/validate_jacobian_warning6.stan
+65 −0 src/test/test-models/syntax-only/validate_jacobian_warning_good.stan
+18 −0 src/test/test-models/syntax-only/validate_left_division_good.stan
+16 −0 src/test/test-models/syntax-only/validate_logical_negate_expr_good.stan
+12 −0 src/test/test-models/syntax-only/validate_multiplication.stan
+28 −0 src/test/test-models/syntax-only/validate_negate_expr_good.stan
+14 −0 src/test/test-models/syntax-only/validate_set_double_range_lower_good.stan
+14 −0 src/test/test-models/syntax-only/validate_set_double_range_upper_good.stan
+10 −0 src/test/test-models/syntax-only/validate_set_fun_type_named_good.stan
+10 −0 src/test/test-models/syntax-only/validate_set_int_range_lower_good.stan
+10 −0 src/test/test-models/syntax-only/validate_set_int_range_upper_good.stan
+19 −0 src/test/test-models/syntax-only/validate_validate_int_expr_good.stan
+198 −36 src/test/unit/gm/parser_test.cpp

0 comments on commit 78f485f

Please sign in to comment.