90 lines
2.1 KiB
Ruby
90 lines
2.1 KiB
Ruby
require 'formula'
|
|
|
|
class Aamath < Formula
|
|
homepage 'http://fuse.superglue.se/aamath/'
|
|
url 'http://fuse.superglue.se/aamath/aamath-0.3.tar.gz'
|
|
sha1 'dc68abaf2131c73ddb1a520c95d65596e30f1b0a'
|
|
|
|
def patches; DATA; end
|
|
|
|
def install
|
|
ENV.j1
|
|
system "make"
|
|
|
|
bin.install "aamath"
|
|
man1.install "aamath.1"
|
|
prefix.install "testcases"
|
|
end
|
|
|
|
test do
|
|
IO.popen("#{bin}/aamath", "w+") do |pipe|
|
|
pipe.write((prefix/"testcases").read)
|
|
pipe.close_write
|
|
assert_match /#{Regexp.escape("f(x + h) = f(x) + h f'(x)")}/, pipe.read
|
|
end
|
|
end
|
|
end
|
|
|
|
__END__
|
|
diff --git a/expr.cc b/expr.cc
|
|
index 7bc0ee3..8f4eaf7 100644
|
|
--- a/expr.cc
|
|
+++ b/expr.cc
|
|
@@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const
|
|
|
|
class SumSymbol : public OpSymbol {
|
|
public:
|
|
- void render(Canvas& c, int r, int c) const;
|
|
+ void render(Canvas& canvas, int r, int c) const;
|
|
};
|
|
|
|
void
|
|
@@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r, int c) const
|
|
|
|
class ProductSymbol : public OpSymbol {
|
|
public:
|
|
- void render(Canvas& c, int r, int c) const;
|
|
+ void render(Canvas& canvas, int r, int c) const;
|
|
};
|
|
|
|
void
|
|
@@ -1612,7 +1612,7 @@ Matrix::render() const
|
|
int cols = num_cols();
|
|
int rows = num_rows();
|
|
|
|
- CanvasPtr ec[cols * rows];
|
|
+ CanvasPtr *ec = new CanvasPtr[cols * rows];
|
|
Size sz[cols * rows];
|
|
|
|
int row_height[rows];
|
|
@@ -1692,6 +1692,8 @@ Matrix::render() const
|
|
|
|
canvas->center();
|
|
|
|
+ delete[] ec;
|
|
+
|
|
return canvas;
|
|
}
|
|
|
|
diff --git a/expr.h b/expr.h
|
|
index 000ebd4..d233da9 100644
|
|
--- a/expr.h
|
|
+++ b/expr.h
|
|
@@ -451,7 +451,7 @@ class Integral : public OpOnFunction {
|
|
|
|
virtual CanvasPtr render_head() const;
|
|
|
|
- void render_symbol(Canvas& c, int r, int c, int h) const;
|
|
+ void render_symbol(Canvas& canvas, int r, int c, int h) const;
|
|
|
|
virtual CanvasPtr render() const;
|
|
};
|
|
@@ -467,7 +467,7 @@ class IntegralOnInterval : public Integral, public OpOverInterval {
|
|
|
|
class OpSymbol {
|
|
public:
|
|
- virtual void render(Canvas& c, int r, int c) const = 0;
|
|
+ virtual void render(Canvas& canvas, int r, int c) const = 0;
|
|
};
|
|
|
|
class SumOrProduct : public OpOnFunction {
|