Re: Gnuplot interface refactoring

[David Bateman]

Teemu,

This is great, but maybe it shouldn't be applied until we get another
version of octave to recommended level. That is a 2.1.58 release, plus
bug fix releases afterwards as needed. There is just too much
potential that this patch will break things...

Cheers
David

According to Teemu Ikonen <address@hidden> (on 07/28/04):
> Hi all,
> 
> Here's the final version of the patch which splits the gnuplot code from the
> parser to a separate file. All the M*lab compatible plotting commands can
> now be easily overridden with m-files. Functions handling temporary files
> are moved from pt-plot.* to file-io.*, which makes a one-line fix to
> octave-forge necessary.
> 
> The patch is attached as a tar+gzipped arch changeset, which means that it's
> just a directory containing the patches, new and deleted files and metadata
> changes. For more info, see:
> http://www.gnu.org/software/gnu-arch/tutorial/changeset-format.html
> 
> In principle, it can be applied to a source tree by just issuing a 
> 'tla dopatch' command, but this will also bring some arch cruft (id-files)
> with it. A changelog entry is attached separately.
> 
> Teemu

> drwxr-xr-x tpikonen/xraylab  0 2004-07-28 11:22:34 gnuplot-patch/
> -rw-r--r-- tpikonen/xraylab  0 2004-07-28 11:22:03 
> gnuplot-patch/original-only-dir-metadata
> -rw-r--r-- tpikonen/xraylab  0 2004-07-28 11:22:03 
> gnuplot-patch/modified-only-dir-metadata
> drwxr-xr-x tpikonen/xraylab  0 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/
> drwxr-xr-x tpikonen/xraylab  0 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/
> drwxr-xr-x tpikonen/xraylab  0 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/.arch-ids/
> -rw-r--r-- tpikonen/xraylab 74 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/.arch-ids/pt-plot.cc.id
> -rw-r--r-- tpikonen/xraylab 74 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/.arch-ids/pt-plot.h.id
> -rw-r--r-- tpikonen/xraylab 28521 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/pt-plot.cc
> -rw-r--r-- tpikonen/xraylab  8721 2004-07-28 11:22:03 
> gnuplot-patch/removed-files-archive/src/pt-plot.h
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/.arch-ids/
> -rw-r--r-- tpikonen/xraylab    73 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/.arch-ids/hold.m.id
> -rw-r--r-- tpikonen/xraylab    73 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/.arch-ids/ishold.m.id
> -rw-r--r-- tpikonen/xraylab  1502 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/hold.m
> -rw-r--r-- tpikonen/xraylab  1077 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/scripts/plot/ishold.m
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/src/
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/src/.arch-ids/
> -rw-r--r-- tpikonen/xraylab    72 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/src/.arch-ids/gnuplot.l.id
> -rw-r--r-- tpikonen/xraylab 36730 2004-07-28 11:22:03 
> gnuplot-patch/new-files-archive/src/gnuplot.l
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:20 gnuplot-patch/patches/
> -rw-r--r-- tpikonen/xraylab   176 2004-07-28 11:22:05 
> gnuplot-patch/patches/Makeconf.in.patch
> -rw-r--r-- tpikonen/xraylab   793 2004-07-28 11:22:06 
> gnuplot-patch/patches/configure.in.patch
> drwxr-xr-x tpikonen/xraylab     0 2004-07-28 11:22:33 
> gnuplot-patch/patches/src/
> -rw-r--r-- tpikonen/xraylab  1813 2004-07-28 11:22:20 
> gnuplot-patch/patches/src/Makefile.in.patch
> -rw-r--r-- tpikonen/xraylab  1297 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/defun-int.h.patch
> -rw-r--r-- tpikonen/xraylab   934 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/defun.cc.patch
> -rw-r--r-- tpikonen/xraylab   994 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/defun.h.patch
> -rw-r--r-- tpikonen/xraylab   577 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/dirfns.cc.patch
> -rw-r--r-- tpikonen/xraylab  1941 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/file-io.cc.patch
> -rw-r--r-- tpikonen/xraylab   326 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/file-io.h.patch
> -rw-r--r-- tpikonen/xraylab   334 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/help.cc.patch
> -rw-r--r-- tpikonen/xraylab  1499 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/lex.h.patch
> -rw-r--r-- tpikonen/xraylab 10091 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/lex.l.patch
> -rw-r--r-- tpikonen/xraylab   848 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/mkbuiltins.patch
> -rw-r--r-- tpikonen/xraylab   440 2004-07-28 11:22:21 
> gnuplot-patch/patches/src/mkgendoc.patch
> -rw-r--r-- tpikonen/xraylab   219 2004-07-28 11:22:22 
> gnuplot-patch/patches/src/octave.cc.patch
> -rw-r--r-- tpikonen/xraylab   588 2004-07-28 11:22:22 
> gnuplot-patch/patches/src/octave.gperf.patch
> -rw-r--r-- tpikonen/xraylab  7162 2004-07-28 11:22:22 
> gnuplot-patch/patches/src/parse.y.patch
> -rw-r--r-- tpikonen/xraylab   219 2004-07-28 11:22:22 
> gnuplot-patch/patches/src/pt-all.h.patch
> -rw-r--r-- tpikonen/xraylab  1487 2004-07-28 11:22:22 
> gnuplot-patch/patches/src/pt-bp.cc.patch
> -rw-r--r-- tpikonen/xraylab   786 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-bp.h.patch
> -rw-r--r-- tpikonen/xraylab  2727 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-check.cc.patch
> -rw-r--r-- tpikonen/xraylab   790 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-check.h.patch
> -rw-r--r-- tpikonen/xraylab  3505 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-pr-code.cc.patch
> -rw-r--r-- tpikonen/xraylab   796 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-pr-code.h.patch
> -rw-r--r-- tpikonen/xraylab  1407 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/pt-walk.h.patch
> -rw-r--r-- tpikonen/xraylab  1909 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/symtab.h.patch
> -rw-r--r-- tpikonen/xraylab   461 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/token.cc.patch
> -rw-r--r-- tpikonen/xraylab   925 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/token.h.patch
> -rw-r--r-- tpikonen/xraylab   373 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/toplev.cc.patch
> -rw-r--r-- tpikonen/xraylab  5803 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/variables.cc.patch
> -rw-r--r-- tpikonen/xraylab   403 2004-07-28 11:22:23 
> gnuplot-patch/patches/src/variables.h.patch
> -rw-r--r-- tpikonen/xraylab   413 2004-07-28 11:22:34 
> gnuplot-patch/patches/src/ls-oct-ascii.cc.patch
> -rw-r--r-- tpikonen/xraylab     0 2004-07-28 11:22:34 
> gnuplot-patch/orig-dirs-index
> -rw-r--r-- tpikonen/xraylab  3343 2004-07-28 11:22:34 
> gnuplot-patch/orig-files-index
> -rw-r--r-- tpikonen/xraylab     0 2004-07-28 11:22:34 
> gnuplot-patch/mod-dirs-index
> -rw-r--r-- tpikonen/xraylab  3558 2004-07-28 11:22:34 
> gnuplot-patch/mod-files-index

> 2004-07-28  Teemu Ikonen  <address@hidden>
> 
>       * gnuplot.l: New file. Move gnuplot interface here from the parser.
>       * pt-plot.cc, pt-plot.h: Delete.
>         * Makefile.in: Remove references to pt-plot.*. Add support for 
>       rawcommands and the new gnuplot code and an option for 
>       disabling gnuplot support in the build.
>       * octave.cc, pt-all.h: Remove references to pt-plot.*
>       * defun-int.h: Add support for DEFRAWCMD macro.
>       * defun.cc: Likewise.
>       * defun.h: Likewise.
>       * mkbuiltins: Likewise.
>       * mkgendoc: Likewise.
>         * dirfns.cc: Remove reference to pt-plot.h, 
>       (octave_change_to_directory): Comment out the call to
>       do_external_plotter_cd, at least for now.
>       * file-io.cc: Remove reference to pt-plot.h.
>       Add tmp-file handling from pt-plot.cc here.
>       (tmp_files): Move to file-io.cc.
>       (fprintf): Remove unused variable return_char_count.
>       (save_in_tmp_file): Move to file-io.cc.
>       (mark_for_deletion): Move to file-io.cc.
>       (cleanup_tmp_files): Move to file-io.cc.
>       * file-io.h: Add definitions for new functions in file-io.cc
>       * help.cc: Remove help strings for gplot and gsplot.
>       * lex.h, lex.l: Remove everything plotting related, add support for
>       rawcommands.
>       (doing_rawcommand): New lexical_feedback variable
>       * ls-oct-ascii.cc: Remove reference to non-existant file 
>       tree-plot.cc from a comment.
>       * octave.gperf: Remove plotting keywords.
>       * parse.y: Remove plotting related grammar.
>       (make_plot_command): Delete.    
>       * pt-bp.cc: (tree_breakpoint::visit_plot_command,
>         tree_breakpoint::visit_plot_limits, tree_breakpoint::visit_plot_range,
>       tree_breakpoint::visit_subplot, tree_breakpoint::visit_subplot_axes,
>       tree_breakpoint::visit_subplot_list, 
>       tree_breakpoint::visit_subplot_style, 
>       tree_breakpoint::visit_subplot_using): Delete
>       * pt-bp.h: Likewise.
>         * pt-check.cc: (tree_checker::visit_plot_command,
>         tree_checker::visit_plot_limits, tree_checker::visit_plot_range,
>       tree_checker::visit_subplot, tree_checker::visit_subplot_axes,
>       tree_checker::visit_subplot_list, tree_checker::visit_subplot_style,
>       tree_checker::visit_subplot_using): Delete.
>       * pt-check.h: Likewise.
>       * pt-pr-code.cc: (tree_print_code::visit_plot_command,
>       tree_print_code::visit_plot_limits, tree_print_code::visit_plot_range,
>       tree_print_code::visit_subplot, tree_print_code::visit_subplot_axes,
>       tree_print_code::visit_subplot_list, 
>       tree_print_code::visit_subplot_style, 
>       tree_print_code::visit_subplot_using): Delete.
>       * pt-pr-code.h: Likewise.
>       * pt-walk.h: Remove references to plotting related classes and
>       functions
>       * symtab.h: Add support for rawcommands. 
>       (symbol_record::void mark_as_rawcommand, 
>       symbol_record::unmark_rawcommand, symbol_record::is_rawcommand):
>       New functions.
>       * token.cc: (token::token (plot_tok_type t, int l, int c), 
>       token::pttype): Delete.
>       * token.h: (plot_tok_type): Delete.
>       * toplev.cc: Remove reference to pt-plot.h, 
>       (do_octave_atexit): Remove call to close_plot_stream().
>       * variables.cc: (mark_as_command, unmark_command): Documentation 
>       fixes. (iscommand, mark_as_rawcommand, unmark_rawcommand, 
>       israwcommand): New command style functions.
>       (is_marked_as_rawcommand, mark_as_rawcommand,
>       unmark_rawcommand, is_rawcommand_name): New functions.
>       (rawcommand_set): New variable.
>       variables.h: Add is_rawcommand_name.
>        
> 
> 
>        


-- 
David Bateman                                address@hidden
Motorola CRM                                 +33 1 69 35 48 04 (Ph) 
Parc Les Algorithmes, Commune de St Aubin    +33 1 69 35 77 01 (Fax) 
91193 Gif-Sur-Yvette FRANCE

The information contained in this communication has been classified as: 

[x] General Business Information 
[ ] Motorola Internal Use Only 
[ ] Motorola Confidential Proprietary