Merge branch 'ht/graphs'
commit9d61fd28f10db90708f801ff0e0cbdd1486e9dbd
authorHenrik Tidefelt <tiddeweb@gmail.com>
Sun, 24 Jan 2016 20:38:53 +0000 (24 21:38 +0100)
committerHenrik Tidefelt <tiddeweb@gmail.com>
Sun, 24 Jan 2016 20:38:53 +0000 (24 21:38 +0100)
tree977d36489458332800067d4d81757234752d0141
parent9f98358e59f896c9b211f9ce8eea307c0c9e2bf5
parent42f0a2c7e2d24acac9ccd4a97a9d8e1000579503
Merge branch 'ht/graphs'

* ht/graphs: (161 commits)
  Address compiler warnings about unused local typedefs
  Fix bugs detected as compiler warnings
  Doc: Adding possible directions for future developments related to graphs
  Draft for hierarchical graph type documentation
  Doc: Break out a separate chapter for hierarchical graphs in user guide
  Doc infrastructure for linking to chapter in user guide
  Doc infrastructure for "Under development" banner
  Documenting the main remaining design challenge for hierarhical graphs
  Initial design ideas for hierarchical graphs
  Finnish the sorting-performance example, being the first log-log plot
  Improved path computation for unused handles at ends of open paths
  New functions from cmath: exp, log, log10, pow
  Relax evaluation during merge sort to be able to handle bigger inputs
  Internal utilities for unwinding the evaluation engine's call stack
  Extended the text/sort test
  Remove debug prints from merge sort
  Improved merge sort, full of debug prints
  Revert "Remove debug prints from merge sort"
  Bugfix: Consify sequences to be sorted
  Enable consification of result of ForcingListContinuation and friends
  ...

# Conflicts:
# VERSION
# doc/build/html/Makefile.am
# doc/parts/bindings/functions.sxml
# doc/parts/bindings/misc.sxml
# doc/parts/bindings/simple.sxml
# doc/parts/extensions/Shapes-Data-conssupport.sxml
# doc/parts/extensions/index.sxml
# doc/parts/formats/html.xsl
# doc/parts/formats/language-elements-html.xsl
# doc/parts/namespace/Shapes-Numeric-Constant.sxml
# doc/parts/state-types/containers.sxml
# doc/parts/state-types/formats/html.xsl
# doc/parts/syntax/bracket.sxml
# doc/parts/syntax/compound.sxml
# doc/parts/syntax/misc.sxml
# doc/parts/types/containers.sxml
# doc/parts/types/formats/html.xsl
# doc/parts/types/special.sxml
# doc/styles/html/shapes.css
# edit/emacs/shapes-mode.el
# examples/applications/doughnut.shape
# examples/doc/lexiographicSort.shape
# examples/doc/tutorial-view.shape
# examples/features/amb.blank
# examples/features/approximators3d.shape
# examples/features/cond-impl.blank
# examples/features/escape.blank
# examples/features/folds.blank
# examples/features/sidepaths.shape
# examples/features/speedtest.shape
# examples/features/upsample.shape
# examples/features/values.blank
# examples/features/warm.blank
# examples/features/warm2D.shape
# examples/features/zbuflines.shape
# examples/problems/choose.shape
# examples/showcase/mergepaths.shape
# resources/Makefile.am
# resources/extensions/Shapes/Control/cond.shext
# resources/extensions/Shapes/Data/conssupport.shext
# resources/extensions/Shapes/Geometry/linkpaths.shext
# source/Shapes_Lang_decls.h
# source/ast.cc
# source/ast.h
# source/astflow.cc
# source/astfun.cc
# source/astfun.h
# source/astvar.cc
# source/astvar.h
# source/classexceptions.cc
# source/classtypes.cc
# source/coreast.cc
# source/coreconstruct.cc
# source/coreelem.cc
# source/coremisc.cc
# source/environment.cc
# source/environment.h
# source/eval_interactive.cc
# source/functiontypes.cc
# source/globals.cc
# source/globals.h
# source/shapesexceptions.cc
# source/shapesexceptions.h
# source/shapesparser.yy
# source/shapesscanner.cc
# source/shapesscanner.h
# source/shapesvalue.cc
# source/shapesyylex.ll
# source/sourcelocation.h
112 files changed:
VERSION
doc/build/html/Makefile.am
doc/parts/extensions/Shapes-Data-seq-support.sxml
doc/parts/extensions/index.sxml
doc/parts/formats/html.xsl
doc/parts/formats/language-elements-html.xsl
doc/parts/formats/man.xsl
doc/parts/formats/plain-book-html.xsl
doc/parts/formats/text.xsl
doc/parts/guides/3D.sxml
doc/parts/guides/paths.sxml
doc/parts/index/index.sxml
doc/parts/namespace/Shapes-Data.sxml
doc/parts/namespace/Shapes-Graphics-Tag.sxml
doc/parts/namespace/Shapes-Graphics.sxml
doc/parts/state-types/containers.sxml
doc/parts/state-types/formats/html.xsl
doc/parts/state-types/index.sxml
doc/parts/syntax/bracket.sxml
doc/parts/syntax/compound.sxml
doc/parts/syntax/misc.sxml
doc/parts/types/containers.sxml
doc/parts/types/formats/html.xsl
doc/parts/types/functions.sxml
doc/parts/types/index.sxml
doc/parts/types/points-paths.sxml
doc/parts/types/special.sxml
doc/parts/types/text.sxml
doc/styles/html/shapes.css
edit/emacs/shapes-mode.el
examples/applications/doughnut.shape
examples/applications/spacebase-cross.shape
examples/applications/spacebase.shape
examples/doc/blockdraw-connections-connect.shape
examples/doc/lexiographicSort.blank
examples/doc/tutorial-view.shape
examples/features/amb.blank
examples/features/approximators3d.shape
examples/features/array.shape
examples/features/cond-impl.blank
examples/features/escape.blank
examples/features/folds.blank
examples/features/lightdemo.shape
examples/features/lightdemo2.shape
examples/features/lightdemo3.shape
examples/features/lightdemo3b.shape
examples/features/myfontdemo.shape
examples/features/sidepaths.shape
examples/features/speedtest.shape
examples/features/states.blank
examples/features/tiebreakers.shape
examples/features/upsample.shape
examples/features/values.blank
examples/features/warm.blank
examples/features/warm2D.shape
examples/features/zbufdemo.shape
examples/features/zbuflightdemo.shape
examples/features/zbuflines.shape
examples/features/zsorterdemo.shape
examples/problems/choose.shape
examples/showcase/kjmrobot.shape
examples/showcase/mergepaths.shape
resources/extensions/Shapes/Control/cond.shext
resources/extensions/Shapes/Data/seq-support.shext
resources/extensions/Shapes/Geometry/linkpaths.shext
source/Makefile.am
source/Shapes_Lang_decls.h
source/ast.cc
source/ast.h
source/astclass.cc
source/astflow.cc
source/astfun.cc
source/astfun.h
source/astvar.cc
source/astvar.h
source/classexceptions.cc
source/containertypes.cc
source/continuations.cc
source/continuations.h
source/coreannotation.cc
source/coreast.cc
source/coreconstruct.cc
source/coredecomp.cc
source/coredraw.cc
source/coreelem.cc
source/corefont.cc
source/coremisc.cc
source/corepath.cc
source/corestate.cc
source/drawabletypes.cc
source/elementarytypes.cc
source/environment.cc
source/environment.h
source/eval_interactive.cc
source/eval_non_interactive.cc
source/functiontypes.cc
source/functiontypes.h
source/globals.cc
source/globals.h
source/hottypes.cc
source/main.cc
source/multipage.cc
source/shapesexceptions.cc
source/shapesexceptions.h
source/shapesparser.yy
source/shapesscanner.cc
source/shapesscanner.h
source/shapesvalue.cc
source/shapesyylex.ll
source/sourcelocation.cc
source/sourcelocation.h
source/texttypes.cc