From 9ca5a58108ea873729fb129d50654356785fae3f Mon Sep 17 00:00:00 2001 From: Jacob Nevins <0jacobnk.git@chiark.greenend.org.uk> Date: Sat, 18 Jan 2014 15:38:22 +0000 Subject: [PATCH 1/1] Comments, licensing, etc --- src/COPYING | 339 +++++++++++++++++++++++++++++++++++++++++ src/bedbugs.c | 104 ++++++++++--- src/make-ruletable.cpp | 7 + src/mungetable.pl | 34 ++++- 4 files changed, 464 insertions(+), 20 deletions(-) create mode 100644 src/COPYING diff --git a/src/COPYING b/src/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/src/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/src/bedbugs.c b/src/bedbugs.c index ef9fd3c..f703ad6 100644 --- a/src/bedbugs.c +++ b/src/bedbugs.c @@ -1,6 +1,55 @@ /* - * Relevant bits of original copyright notice from - * http://bjh21.me.uk/bedstead/ bedstead.c #137: + * Output bits of a rule file for Golly for a Conway-like cellular + * automaton displayed with smoothing reminiscent of the Mullard + * SAA5050 Teletext character generation (aka BBC "MODE 7"). + * + * The resulting automaton flips the world between two states: + * one where everything is one of two states, and one where an + * expanded set of 32 states is used (16 'off', 16 'on') according + * to what diagonals are required for the smoothing. Each of the + * expanded states has an associated icon. + * + * In the first step we go from two states to 32 implementing the + * smoothing algorithm as a transition function on a 3x3 neighbourhood. + * In the second step we go from 32 back to 2 with a Conway-derived + * transition function, again on a 3x3 neighbourhood (this step is not + * in this source file). + * (FIXME: this would be more slick, although probably even less + * efficient, implemented in one go with a 5x5 neighbourhood, which + * Golly does support.) + * + * The smoothing algorithm and graphics are derived from 'Bedstead' by + * Ben Harris: http://bjh21.me.uk/bedstead/ + * The idea of applying this smoothing to Conway's Life can be blamed + * on Simon Tatham. + */ + +/* + * This file is part of Bedbugs. + * Copyright (C) 2014 Jacob Nevins. + * Portions copyright (C) 2009 Ben Harris (see below). + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Website: http://www.chiark.greenend.org.uk/ucgi/~jacobn/git/bedbugs-git/ + * + * + * This source file, bedbugs.c, is based on + * http://bjh21.me.uk/bedstead/ bedstead.c bzr r137 + * from which the following bits of the copyright notice and documentation + * remain relevant: * * [...] the file is covered by the following: * @@ -27,8 +76,8 @@ * SOFTWARE. */ /* - * This is a program to construct an outline font from a bitmap. It's - * based on the character-rounding algorithm of the Mullard SAA5050 + * This [was once] a program to construct an outline font from a bitmap. + * It's based on the character-rounding algorithm of the Mullard SAA5050 * series of Teletext character generators, and thus works best on * character shapes in the same style of those of the SAA5050. This * file includes all of the glyphs from the SAA5050, SAA5051, SAA5052, @@ -73,18 +122,6 @@ * # # . . . . / # / . . . / # / . . . * # # . . . . # / . . . . # / . . . . * - * That is the interesting part of the program, and is in the dochar() - * function. Most of the rest is just dull geometry to join all the - * bits together into a sensible outline. Much of the code is wildly - * inefficient -- O(n^2) algorithms aren't much of a problem when you - * have at most a few thousand points to deal with. - * - * A rather nice feature of the outlines produced by this program is - * that when rasterised at precisely 10 or 20 pixels high, they - * produce the input and output respectively of the character-rounding - * process. While there are obious additional smoothings that could - * be applied, doing so would probably lose this nice property. - * * [...] */ @@ -154,7 +191,8 @@ triangles(bool *r, int size, int startpos, int bl, int br, int tr, int tl) static void whitepixel(bool *r, int size, int bl, int br, int tr, int tl) { - /* wrt blackpixel(): -1 for adjacency, -1 for gridlines */ + /* wrt blackpixel(): -1 for adjacency, -1 for gridlines + * (which Golly has no apparent way to suppress :/ ) */ const int startpos = size-size/4-2; triangles(r, size, startpos, bl, br, tr, tl); } @@ -172,6 +210,16 @@ blackpixel(bool *r, int size, int bl, int br, int tr, int tl) int main(int argc, char *argv[]) { + + /* FIXME: output a complete rule file rather than a heap of + * fragments requiring manual assembly */ + + /* Bedbugs step 1: output smoothing rules as a Golly rule + * table mapping from (0,1) to an expanded set of states that + * we can hang icons from. (The smoothing algorithm requires + * a 3x3 neighbourhood, which is fortuitous.) */ + + /* Index into small bitmap */ #define GETPIX(x,y) (!!(iter & 1u<<((y)*3+(x)))) #define L GETPIX(x-1, y) #define R GETPIX(x+1, y) @@ -182,9 +230,12 @@ int main(int argc, char *argv[]) #define DL GETPIX(x-1, y+1) #define DR GETPIX(x+1, y+1) + /* Iterate over all neighbourhoods (9 cells) */ int iter; for (iter = 0; iter < 1u<<9; iter++) { int state, x = 1, y = 1; + /* The core of the Bedstead smoothing algorithm + * from Ben Harris. */ if (GETPIX(x, y)) { bool tl, tr, bl, br; @@ -200,6 +251,7 @@ int main(int argc, char *argv[]) if (R || UR || U) tr = true; if (L || DL || D) bl = true; if (R || DR || D) br = true; + /* On states are 18..33 */ state = 2 + 16 + (bl | br<<1 | tr<<2 | tl<<3); } else { bool tl, tr, bl, br; @@ -211,11 +263,23 @@ int main(int argc, char *argv[]) if (R && U && !UR) tr = true; if (L && D && !DL) bl = true; if (R && D && !DR) br = true; + /* Off states are 2..17 */ state = 2 + (bl | br<<1 | tr<<2 | tl<<3); } + /* Output rule in Golly rule format + * (FIXME completely unoptimised) */ printf("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", GETPIX(x,y),U,UR,R,DR,D,DL,L,UL,state); } + + /* Bedbugs step 2: icons. In each size supported by Golly, + * draw one icon per state, in the XPM format Golly wants. + * This does not actually depend on step 1 at all. + * (FIXME: but it could. Some of the states we generate icons + * and rules for are not actually reachable. We could spot + * unused states above and avoid generating icons or rules for + * them.) + * (FIXME: we could also output pre-Golly-2.5 format icons) */ { const int sizes[] = {7, 15, 31}; int size_index; @@ -230,14 +294,16 @@ int main(int argc, char *argv[]) for (state = 1; state < 34; state++) { bool *r = blank(size); if (state == 0) { - ; /* nothing */ + ; /* Conway 'off': nothing */ } else if (state == 1) { - /* everything */ + /* Conway 'on': everything */ memset(r, 1, size*size*sizeof(*r)); } else if (state < 16+2) { + /* Bedstead 'off' */ int bits = ~(state-2); whitepixel(r, size, bits&1, bits&2, bits&4, bits&8); } else { + /* Bedstead 'on' */ int bits = state-16-2; blackpixel(r, size, bits&1, bits&2, bits&4, bits&8); } diff --git a/src/make-ruletable.cpp b/src/make-ruletable.cpp index 3c7c52b..805e5b7 100644 --- a/src/make-ruletable.cpp +++ b/src/make-ruletable.cpp @@ -1,5 +1,8 @@ /*** / +[This file is part of Bedbugs. All I've done is made it implement +the Conway transition function. Original copyright notice follows:] + This file is part of Golly, a Game of Life Simulator. Copyright (C) 2008 Andrew Trevorrow and Tomas Rokicki. @@ -651,9 +654,13 @@ int main() { // parameters for use: const int N_STATES = 2; + // Bedbugs: FIXME: output would probably be more efficient if we used + // this, but also complicated const TSymm symmetry = none; const int nhood_size = 9; const string output_filename = "life.table"; + // Bedbugs: we need these because they will be munged into real + // transitions: const bool remove_stasis_transitions = false; vector rules; diff --git a/src/mungetable.pl b/src/mungetable.pl index 705a198..369d861 100755 --- a/src/mungetable.pl +++ b/src/mungetable.pl @@ -1,5 +1,30 @@ #! /usr/bin/perl -w -# Hack to munge life.table for bedbugs. +# This awful single-use script expands out a description of a +# two-state cellular automaton in Golly table format (such as Conway's +# Life) into an equivalent rule table that collapses the 32 "Bedstead" +# states (16 on, 16 off) into the 2 automaton states while applying +# the same rule. +# It's slightly complicated because it's designed to work with +# the output of Golly make-ruletable.cpp, which is somewhat optimised +# using variables, but this script makes no attempt to optimise its +# output. It uses poorly-named variables to do a lot of its work. + +# This file is part of Bedbugs. +# Copyright (C) 2014 Jacob Nevins. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. my %vars = (); my $done_vars = 0; @@ -13,12 +38,17 @@ while(<>) { die "Complicated variable" unless m/^var (.)=\{0,1\}$/; $vars{$1} = 1; } else { + # Assume this is a table rule. chomp; my @cells = split /,/; my %myvars = (); + # Only supports 8-neighbour automata die "Unexpected number of comma-separated items" unless @cells == 10; my @dirs = qw/c n ne e se s sw w nw/; if (!$done_vars) { + # Variables to match 32 states rather than 2 + # Numbering of states highly tied to bedbugs.c output + # Crap naming scheme: z=off, a=on, q=either print "var zz={0," . join(",", 2..17) . "}\n"; print "var aa={" . join(",", 18..33) . "}\n"; foreach my $d (@dirs) { @@ -30,6 +60,8 @@ while(<>) { } my $i = 0; while (my $dir = pop @dirs) { + # Assume each variable in the input is only referenced once + # per table row die "Duplicate var" if exists($myvars{$cells[$i]}); if (exists($vars{$cells[$i]})) { $myvars{$cells[$i]} = 1; -- 2.30.2