Skip to content

Commit

Permalink
Merge branch 'msvc-support' into msvc-vulkan
Browse files Browse the repository at this point in the history
  • Loading branch information
jamievlin committed Jan 7, 2024
2 parents 25896ce + 4a69c2e commit 31914ea
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
4 changes: 1 addition & 3 deletions doc/asymptote.texi
Original file line number Diff line number Diff line change
Expand Up @@ -6329,9 +6329,7 @@ To store the figures in a separate directory named @code{asy}, one can define
@verbatim
\def\asydir{asy}
@end verbatim
in @code{latexusage.tex} and put the contents of
@url{https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/latexmkrc_asydir}
in a file @code{latexmkrc} in the same directory.
in @code{latexusage.tex}.
@noindent
External @code{Asymptote} code can be included with
@cindex @code{asyinclude}
Expand Down
2 changes: 1 addition & 1 deletion doc/latexmkrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sub asy {return system("asy \"$_[0]\"");}
sub asy {return system("asy -o '$_[0]' '$_[0]'");}
add_cus_dep("asy","eps",0,"asy");
add_cus_dep("asy","pdf",0,"asy");
add_cus_dep("asy","tex",0,"asy");
4 changes: 0 additions & 4 deletions doc/latexmkrc_asydir

This file was deleted.

9 changes: 7 additions & 2 deletions src/dec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,19 @@ types::ty *inferType(position pos, coenv &e, varinit *init)
}

exp *base = dynamic_cast<exp *>(init);
bool Void=false;

if (base) {
types::ty *t = base->cgetType(e);
if (t->kind != ty_overloaded)
Void=t->kind == ty_void;
if (t->kind != ty_overloaded && !Void)
return t;
}

em.error(pos);
em << "could not infer type of initializer";
em << (Void ? "cannot infer from void" :
"could not infer type of initializer");

return primError();
}

Expand Down
2 changes: 1 addition & 1 deletion src/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ string outpath(string name)

string buildname(string prefix, string suffix, string aux)
{
string name=prefix+aux;
string name=outpath(prefix)+aux;
if(!suffix.empty()) name += "."+suffix;
return name;
}
Expand Down

0 comments on commit 31914ea

Please sign in to comment.