Branch: Tag:

2008-06-28

2008-06-28 16:37:03 by Martin Nilsson <mani@lysator.liu.se>

static -> protected

Rev: lib/modules/ADT.pmod/Heap.pike:1.12
Rev: lib/modules/ADT.pmod/Queue.pike:1.14
Rev: lib/modules/ADT.pmod/Relation.pmod/Binary.pike:1.15
Rev: lib/modules/ADT.pmod/Struct.pike:1.20
Rev: lib/modules/ADT.pmod/Table.pmod:1.29
Rev: lib/modules/ADT.pmod/Trie.pike:1.6
Rev: lib/modules/ADT.pmod/module.pmod:1.12
Rev: lib/modules/Arg.pmod:1.6
Rev: lib/modules/Array.pmod:1.110
Rev: lib/modules/Audio.pmod/Codec.pmod:1.11
Rev: lib/modules/Audio.pmod/Format.pmod/MP3.pike:1.4
Rev: lib/modules/Cache.pmod/Storage.pmod/Gdbm.pike:1.12
Rev: lib/modules/Cache.pmod/cache.pike:1.14
Rev: lib/modules/Calendar.pmod/Austrian.pmod:1.8
Rev: lib/modules/Calendar.pmod/Badi.pmod:1.8
Rev: lib/modules/Calendar.pmod/Coptic.pmod:1.8
Rev: lib/modules/Calendar.pmod/Discordian.pmod:1.12
Rev: lib/modules/Calendar.pmod/Event.pmod:1.24
Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.12
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.11
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.11
Rev: lib/modules/Calendar.pmod/Julian.pmod:1.11
Rev: lib/modules/Calendar.pmod/Language.pmod:1.25
Rev: lib/modules/Calendar.pmod/Rule.pmod:1.3
Rev: lib/modules/Calendar.pmod/Stardate.pmod:1.17
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.9
Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.16
Rev: lib/modules/Calendar.pmod/Time.pmod:1.42
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.35
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.44
Rev: lib/modules/Calendar.pmod/YMD.pike:1.33
Rev: lib/modules/Calendar.pmod/module.pmod:1.16
Rev: lib/modules/Calendar_I.pmod/ISO.pmod:1.12
Rev: lib/modules/Calendar_I.pmod/Stardate.pmod:1.5
Rev: lib/modules/Crypto.pmod/DSA.pike:1.8
Rev: lib/modules/Crypto.pmod/HMAC.pike:1.5
Rev: lib/modules/Crypto.pmod/Koremutake.pmod:1.4
Rev: lib/modules/Crypto.pmod/PGP.pmod:1.14
Rev: lib/modules/Crypto.pmod/Pipe.pike:1.9
Rev: lib/modules/Crypto.pmod/RSA.pike:1.11
Rev: lib/modules/Crypto.pmod/Random.pmod:1.19
Rev: lib/modules/Crypto.pmod/Substitution.pike:1.4
Rev: lib/modules/Debug.pmod/Subject.pike:1.9
Rev: lib/modules/Debug.pmod/Wrapper.pike:1.6
Rev: lib/modules/Filesystem.pmod/System.pike:1.20
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.30
Rev: lib/modules/Filesystem.pmod/module.pmod:1.26
Rev: lib/modules/GLU.pmod:1.16
Rev: lib/modules/GLUE.pmod/Driver.pmod/GTK.pike:1.6
Rev: lib/modules/GLUE.pmod/Driver.pmod/Interface.pike:1.3
Rev: lib/modules/GLUE.pmod/Driver.pmod/SDL.pike:1.6
Rev: lib/modules/GLUE.pmod/Events.pmod:1.4
Rev: lib/modules/GLUE.pmod/module.pmod:1.15
Rev: lib/modules/GTKSupport.pmod/pCtree.pike:1.8
Rev: lib/modules/GTKSupport.pmod/pDrawingArea.pike:1.9
Rev: lib/modules/Geography.pmod/Countries.pmod:1.20
Rev: lib/modules/Geography.pmod/Position.pike:1.18
Rev: lib/modules/Getopt.pmod:1.33
Rev: lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike:1.20
Rev: lib/modules/Graphics.pmod/Graph.pmod/module.pmod:1.9
Rev: lib/modules/Graphics.pmod/Graph.pmod/polyline.pike:1.7
Rev: lib/modules/Int.pmod:1.10
Rev: lib/modules/Local.pmod:1.11
Rev: lib/modules/Locale.pmod/Charset.pmod/Tables.pmod/iso88591.pmod:1.3
Rev: lib/modules/Locale.pmod/Charset.pmod/module.pmod:1.57
Rev: lib/modules/Locale.pmod/Language.pmod/nld.pmod:1.2
Rev: lib/modules/Locale.pmod/module.pmod:1.25
Rev: lib/modules/MIME.pmod/ext_to_media_type.pmod:1.7
Rev: lib/modules/MIME.pmod/module.pmod:1.20
Rev: lib/modules/Mapping.pmod:1.10
Rev: lib/modules/Parser.pmod/C.pmod:1.50
Rev: lib/modules/Parser.pmod/LR.pmod/GrammarParser.pmod:1.6
Rev: lib/modules/Parser.pmod/LR.pmod/module.pmod:1.17
Rev: lib/modules/Parser.pmod/Pike.pmod:1.41
Rev: lib/modules/Parser.pmod/RCS.pike:1.39
Rev: lib/modules/Parser.pmod/SGML.pike:1.3
Rev: lib/modules/Parser.pmod/XML.pmod/DOM.pmod:1.14
Rev: lib/modules/Parser.pmod/XML.pmod/NSTree.pmod:1.20
Rev: lib/modules/Parser.pmod/XML.pmod/Tree.pmod:1.72
Rev: lib/modules/Parser.pmod/XML.pmod/Validating.pike:1.14
Rev: lib/modules/Parser.pmod/module.pmod:1.25
Rev: lib/modules/Pike.pmod/module.pmod:1.19
Rev: lib/modules/Process.pmod:1.54
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Bencoding.pmod:1.5
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Peer.pike:1.21
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/PeerID.pmod:1.8
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Port.pike:1.7
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Torrent.pike:1.36
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/module.pmod:1.4
Rev: lib/modules/Protocols.pmod/DNS.pmod:1.96
Rev: lib/modules/Protocols.pmod/DNS_SD.pmod:1.2
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Query.pike:1.93
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Port.pike:1.9
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Request.pike:1.50
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/SSLPort.pike:1.14
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Session.pike:1.22
Rev: lib/modules/Protocols.pmod/HTTP.pmod/module.pmod:1.56
Rev: lib/modules/Protocols.pmod/Ident.pmod:1.12
Rev: lib/modules/Protocols.pmod/LDAP.pmod/client.pike:1.113
Rev: lib/modules/Protocols.pmod/LDAP.pmod/ldap_privates.pmod:1.15
Rev: lib/modules/Protocols.pmod/LDAP.pmod/module.pmod:1.32
Rev: lib/modules/Protocols.pmod/LDAP.pmod/protocol.pike:1.21
Rev: lib/modules/Protocols.pmod/LMTP.pmod:1.12
Rev: lib/modules/Protocols.pmod/Line.pmod:1.23
Rev: lib/modules/Protocols.pmod/LysKOM.pmod/Raw.pike:1.19
Rev: lib/modules/Protocols.pmod/OBEX.pmod:1.8
Rev: lib/modules/Protocols.pmod/SMTP.pmod/module.pmod:1.46
Rev: lib/modules/Protocols.pmod/SNMP.pmod/protocol.pike:1.19
Rev: lib/modules/Protocols.pmod/TELNET.pmod:1.28
Rev: lib/modules/Protocols.pmod/X.pmod/Extensions.pmod:1.16
Rev: lib/modules/Protocols.pmod/XMLRPC.pmod/module.pmod:1.30
Rev: lib/modules/Remote.pmod/module.pmod:1.8
Rev: lib/modules/SSL.pmod/Cipher.pmod:1.16
Rev: lib/modules/SSL.pmod/connection.pike:1.42
Rev: lib/modules/SSL.pmod/context.pike:1.37
Rev: lib/modules/SSL.pmod/session.pike:1.37
Rev: lib/modules/SSL.pmod/sslfile.pike:1.110
Rev: lib/modules/Sql.pmod/Sql.pike:1.92
Rev: lib/modules/Sql.pmod/mysql.pike:1.41
Rev: lib/modules/Sql.pmod/postgres.pike:1.28
Rev: lib/modules/Sql.pmod/rsql.pike:1.13
Rev: lib/modules/Sql.pmod/sql_result.pike:1.18
Rev: lib/modules/Sql.pmod/sql_util.pmod:1.21
Rev: lib/modules/Sql.pmod/tds.pike:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Types.pmod:1.45
Rev: lib/modules/Standards.pmod/EXIF.pmod:1.29
Rev: lib/modules/Standards.pmod/FIPS10_4.pmod:1.4
Rev: lib/modules/Standards.pmod/ID3.pmod:1.24
Rev: lib/modules/Standards.pmod/IDNA.pmod:1.9
Rev: lib/modules/Standards.pmod/IIM.pmod:1.8
Rev: lib/modules/Standards.pmod/ISO639_2.pmod:1.19
Rev: lib/modules/Standards.pmod/URI.pike:1.28
Rev: lib/modules/Standards.pmod/UUID.pmod:1.17
Rev: lib/modules/Standards.pmod/XML.pmod/Wix.pmod:1.27
Rev: lib/modules/Stdio.pmod/FakeFile.pike:1.16
Rev: lib/modules/Stdio.pmod/Readline.pike:1.60
Rev: lib/modules/Stdio.pmod/Terminfo.pmod:1.27
Rev: lib/modules/Stdio.pmod/module.pmod:1.238
Rev: lib/modules/String.pmod/HTML.pmod:1.7
Rev: lib/modules/String.pmod/module.pmod:1.29
Rev: lib/modules/Thread.pmod:1.45
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/CExtractor.pmod:1.28
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod:1.62
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeExtractor.pmod:1.40
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod:1.37
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike:1.52
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/ProcessXML.pmod:1.71
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/module.pmod:1.10
Rev: lib/modules/Tools.pmod/Hilfe.pmod:1.156
Rev: lib/modules/Tools.pmod/Install.pmod:1.35
Rev: lib/modules/Tools.pmod/Legal.pmod/Copyright.pmod:1.12
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/GPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/LGPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/MPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerDeveloper.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerUser.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/module.pmod:1.3
Rev: lib/modules/Tools.pmod/PEM.pmod:1.14
Rev: lib/modules/Tools.pmod/PV.pike:1.10
Rev: lib/modules/Tools.pmod/Shoot.pmod/module.pmod:1.20
Rev: lib/modules/Tools.pmod/Standalone.pmod/assemble_autodoc.pike:1.35
Rev: lib/modules/Tools.pmod/Standalone.pmod/dump.pike:1.10
Rev: lib/modules/Tools.pmod/Standalone.pmod/join_autodoc.pike:1.19
Rev: lib/modules/Tools.pmod/Standalone.pmod/pmar_install.pike:1.8
Rev: lib/modules/Tools.pmod/Standalone.pmod/precompile.pike:1.2
Rev: lib/modules/Tools.pmod/Standalone.pmod/rsqld.pike:1.12
Rev: lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike:1.136
Rev: lib/modules/Tools.pmod/Testsuite.pmod:1.9
Rev: lib/modules/Tools.pmod/sed.pmod:1.6
Rev: lib/modules/Web.pmod/CGI.pmod/Request.pike:1.4
Rev: lib/modules/Web.pmod/Crawler.pmod:1.26
Rev: lib/modules/Web.pmod/OWL.pike:1.7
Rev: lib/modules/Web.pmod/RDF.pike:1.47
Rev: lib/modules/Web.pmod/RSS.pmod:1.7
Rev: lib/modules/Yabu.pmod/module.pmod:1.30
Rev: lib/modules/_Image.pmod/Dims.pmod:1.10
Rev: lib/modules/_Image.pmod/Fonts.pmod:1.13
Rev: lib/modules/_Image.pmod/module.pmod:1.47
Rev: lib/modules/_Image_DWG.pmod:1.5
Rev: lib/modules/_Image_PS.pmod:1.15
Rev: lib/modules/_Image_XCF.pmod:1.25

1:   /* -  * $Id: module.pmod,v 1.16 2008/01/09 16:10:29 grubba Exp $ +  * $Id: module.pmod,v 1.17 2008/06/28 16:36:55 nilsson Exp $    *    * A BNF-grammar in Pike.    * Compiles to a LALR(1) state-machine.
139:    //! the elements of the rule. The return value of the function will become    //! the value of this non-terminal. The default rule is to return the first    //! argument. -  static void create(int nt, array(string|int) r, function|string|void a) +  protected void create(int nt, array(string|int) r, function|string|void a)    {    mixed symbol;   
181:    //! @endint    optional int(-1..1) verbose = 1;    -  static constant severity_kind = ([ NOTICE:"Notice", +  protected constant severity_kind = ([ NOTICE:"Notice",    WARNING:"Warning",    ERROR:"Error" ]);   
201:    //!    //! @seealso    //! @[verbose] -  static void create(int(-1..1)|void verbosity) +  protected void create(int(-1..1)|void verbosity)    {    if (!zero_type(verbosity)) {    verbose = verbosity;
226:    mapping(int : array(Rule)) grammar = ([]);       /* Priority table for terminal symbols */ -  static mapping(string : Priority) operator_priority = ([]); +  protected mapping(string : Priority) operator_priority = ([]);    -  static multiset(int|string) nullable = (< >); +  protected multiset(int|string) nullable = (< >);      #if 0 -  static mapping(mixed : multiset(Rule)) derives = ([]); +  protected mapping(mixed : multiset(Rule)) derives = ([]);       /* Maps from symbol to which rules may start with that symbol */ -  static mapping(mixed : multiset(Rule)) begins = ([]); +  protected mapping(mixed : multiset(Rule)) begins = ([]);   #endif /* 0 */       /* Maps from symbol to the rules that use the symbol    * (used for finding nullable symbols)    */ -  static mapping(int : multiset(Rule)) used_by = ([]); +  protected mapping(int : multiset(Rule)) used_by = ([]);       //! The initial LR0 state.    Kernel start_state;
249:    int lr_error=0;       /* Number of next rule (used only for conflict resolving) */ -  static int next_rule_number = 1; +  protected int next_rule_number = 1;       //! LR0 states that are already known to the compiler.    mapping(string:Kernel) known_states = ([]);
274:    //!    //! An LR(0) item, a partially parsed rule.    //! -  static class Item +  protected class Item    {    //! The rule    Rule r;
307:    //! Equal to r->number + offset.    int item_id;    -  static string _sprintf() +  protected string _sprintf()    {    array(string) res = ({ symbol_to_string(r->nonterminal), ":\t" });   
332:    }       //! Implements an LR(1) state -  static class Kernel { +  protected class Kernel {       //! Used to check if a rule already has been added when doing closures.    multiset(Rule) rules = (<>);
502:    }    }    -  static string _sprintf() +  protected string _sprintf()    {    return sprintf("%{%s\n%}", items);    }    }       //! This is a queue, which keeps the elements even after they are retrieved. -  static class StateQueue { +  protected class StateQueue {       //! Index of the head of the queue.    int head;
553:       /* Several cast to string functions */    -  static string builtin_symbol_to_string(int|string symbol) +  protected string builtin_symbol_to_string(int|string symbol)    {    if (intp(symbol)) {    return "nonterminal"+symbol;
562:    }    }    -  static function(int|string : string) symbol_to_string = builtin_symbol_to_string; +  protected function(int|string : string) symbol_to_string = builtin_symbol_to_string;       //! Pretty-prints a rule to a string.    //!
601:    }       //! Pretty-prints the current grammar to a string. -  static string _sprintf() +  protected string _sprintf()    {    array(string) res = ({});   
836:       /* Here come the functions used by the compiler */    -  static Kernel first_state() +  protected Kernel first_state()    {    Kernel state = Kernel();   
869:    //! In the queue section are the states that remain to be compiled.    StateQueue s_q;    -  static ADT.Stack item_stack; +  protected ADT.Stack item_stack;    -  static void traverse_items(Item i, +  protected void traverse_items(Item i,    function(int:void) conflict_func)    {    int depth;
915:    }    }    -  static void shift_conflict(int empty) +  protected void shift_conflict(int empty)    {    empty; /* Ignored */    }    -  static void handle_shift_conflicts() +  protected void handle_shift_conflicts()    {    item_stack = ADT.Stack(131072);   
947:    }    }    -  static void follow_conflict(int empty) +  protected void follow_conflict(int empty)    {    empty; /* Ignored */    }    -  static void handle_follow_conflicts() +  protected void handle_follow_conflicts()    {    item_stack = ADT.Stack(131072);   
979:    }    }    -  static int go_through(Kernel state, int item_id, +  protected int go_through(Kernel state, int item_id,    Item current_item)    {    Item i, master;
1024:    }    }    -  static int repair(Kernel state, multiset(int|string) conflicts) +  protected int repair(Kernel state, multiset(int|string) conflicts)    {    multiset(int|string) conflict_set = (<>);