diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.hi *.o husky -PropertyTest +CalculatorTest +ConverterTest *.swp TAGS diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-03-08 Markus Dittrich + + * 0.3 release + + * lots of bug fixes. In particular, operations + with unary "-" now work properly (such as 3*-3) + Added more unit tests and use quickcheck to test + some of the unit conversion properties. + + * added unit conversion framework. Currently, + husky "knows about" the basic temperature and length + conversions. More to follow. + + * added basic help system + + 2008-02-22 Markus Dittrich * 0.2 release diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,18 +1,21 @@ # Copyright 2008 Markus Dittrich # Distributed under the terms of the GNU General Public License v3 -VERSION=0.2 +VERSION=0.3 DESTDIR= mandir=$(DESTDIR)/usr/share/man/man1 docdir=$(DESTDIR)/usr/share/doc/husky-$(VERSION) htmldir=$(docdir)/html bindir=$(DESTDIR)/usr/bin -GHC_FLAGS_DEVEL = -O -fwarn-incomplete-patterns -fwarn-incomplete-record-updates -fwarn-missing-fields -fwarn-missing-methods -fwarn-missing-signatures -fwarn-name-shadowing -fwarn-orphans -fwarn-overlapping-patterns -fwarn-simple-patterns -fwarn-tabs -fwarn-type-defaults -fwarn-monomorphism-restriction -fwarn-unused-binds -fwarn-unused-imports -fwarn-unused-matches +GHC_FLAGS_DEVEL = -O -Wall -Werror -fwarn-simple-patterns -fwarn-tabs -fwarn-incomplete-record-updates -fwarn-monomorphism-restriction -fwarn-implicit-prelude GHC_FLAGS_RELEASE = -O2 OBJECTS = src/husky.hs src/CalculatorParser.hs src/CalculatorState.hs \ - src/ExtraFunctions.hs src/PrettyPrint.hs src/TokenParser.hs + src/ExtraFunctions.hs src/HelpParser.hs src/InfoRoutines.hs \ + src/Parser.hs src/PrettyPrint.hs src/TokenParser.hs \ + src/UnitConverter.hs src/UnitConversionParser.hs + all: husky @@ -25,9 +28,12 @@ check: $(OBJECTS) - ghc -i./src --make test/PropertyTest.hs - ./test/PropertyTest + ghc -i./src --make test/CalculatorTest.hs + ghc -i./src --make test/ConverterTest.hs + ./test/CalculatorTest + ./test/ConverterTest + install: husky install -d $(docdir) install -d $(bindir) @@ -41,4 +47,4 @@ clean: rm -f src/*.o src/*.hi src/husky test/*.o test/*.hi \ - test/PropertyTest + test/CalculatorTest diff --git a/doc/usage.html b/doc/usage.html --- a/doc/usage.html +++ b/doc/usage.html @@ -294,7 +294,7 @@ Author: Markus Dittrich Version: -0.2 (02/22/2008) +0.3 (03/08/2008)
@@ -302,6 +302,17 @@

husky is a command line calculator with a small memory footprint. It can be used in a fashion similar to the interactive shells of python, octave, or ghci.

+
+
+

Functionality

+

Husky presently can be used as

+
    +
  1. calculator
    2. +
  2. unit converter
    3. +
+

The following sections describe in detail each functionality.

+
+

Calculator

Currently, the mathematical operations "+", "-", "*", and "/" are supported with arbitrary nesting of parenthesised expressions. All calculations are performed in double @@ -316,7 +327,8 @@

  • cosh, sinh, tanh, acosh, asinh, atanh: hyperbolic trigonometric functions and inverse

    • Furthermore, users can define any number of variables via

    -

    variable name = value

    +
    +variable name = value

    where variable name can be any combination of alphanumeric characters but has to begin with a letter. Hence, foobar1 is fine, but 1foobar is not. Defined variables can be @@ -326,12 +338,37 @@ prompt (including command history). See [1] for more detail.

    +
    +

    Unit Converter

    +

    The unit conversion functionality of husky can be used via the +command

    +
    +\c[onvert] <unit value> <from unit> <to unit> [ :: <unit type>]
    +

    Here, we convert <unit value> in units of <from unit> to the +target unit <to unit>. In addition, the user may further specify +the unit type (e.g. Length, Time, ...) to disambiguate a unit +conversion request. The space between <unit value> and <from unit> +is optional. E.g.:

    +
    +\c 1m yd
+\c 1 m yd
+\c 1 m yd :: Length
+
    +

    will all convert 1 meter into yards. Please type:

    +
    +\h[elp] units
+
    +

    for a list of all unit conversions.

    +
    +

    Command Shortcuts

    The following commands are available at the command prompt:

    • \q : quit husky
    • \v : list all currently defined variables
      • +
    • \t : current time
      • +
    • \h[elp] : available help