about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Renamed title_bar_set_status -> title_bar_set_presenceJames Booth2014-01-166-11/+13
|
* Renamed title_bar -> winJames Booth2014-01-161-31/+31
|
* Renamed title_bar_title -> title_bar_consoleJames Booth2014-01-163-9/+9
|
* Removed dirty flag from titlebarJames Booth2014-01-161-15/+16
|
* Implemented chat logging options for OTR messagesJames Booth2014-01-135-7/+27
| | | | | | | | on - Log OTR messages as plaintext off - Do not log OTR messages redact - Log, but replace the text with '[redacted]' Defaults to redact
* Added setting /otr log on|off|redactJames Booth2014-01-136-5/+66
|
* Fixed GString freeing before use in otr.cJames Booth2014-01-131-2/+2
|
* Check for already established but not used OTR session on /otr start <contact>James Booth2014-01-131-2/+3
| | | | | For example, one may have been established from the other end, without any messages being sent yet
* Implemented /otr start <contact>James Booth2014-01-131-0/+11
|
* Open new chat win, or use existing for /otr start <contact>James Booth2014-01-131-9/+25
|
* Added contact autocompletion to /otr start <contact>James Booth2014-01-131-0/+5
|
* Moved otr autocompletion to functionJames Booth2014-01-131-3/+17
|
* Removed unused otr callbacksJames Booth2014-01-131-59/+0
|
* Added /otr to /help chattingJames Booth2014-01-121-1/+1
|
* pre { line-height: 125%; } td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
//: Support jumps to a specific label (the 'jump target') i * 
Added /otr autocompleter and updated helpJames Booth2014-01-121-5/+17
| |
| * Added /otr end commandJames Booth2014-01-112-1/+16
| |
| * End OTR session when user closes chat windowJames Booth2014-01-114-5/+62
| |
| * Handle window creation for incoming and outgoing OTR sessionsJames Booth2014-01-116-8/+53
| |
| * Show contacts fingerprint on /otr theirfpJames Booth2014-01-112-3/+14
| |
| * Added /otr theirfp with hardcoded fingerprintJames Booth2014-01-117-9/+47
| |
| * Renamed fingerprint command, updated helpJames Booth2014-01-112-6/+7
| |
| * Added [OTR] and (trusted/untrusted) to titlebar for OTR sessionsJames Booth2014-01-115-0/+17
| |
| * Refactored setting window recipientJames Booth2014-01-112-32/+30
| |
| * Use version 1 query to start OTR sessionJames Booth2014-01-111-0/+2
| |
| * Require '/otr start' from both parties before encryption used both waysJames Booth2014-01-119-18/+114
| |
| * Load OTR private key on connect, gen command checks if already generatedJames Booth2014-01-114-25/+102
| |
| * Implemented message encryption, session started with whitspace tags on first ↵James Booth2014-01-102-20/+8
| | | | | | | | message
| * Added "/otr fp" to show users fingerprintJames Booth2014-01-104-11/+27
| |
| * Show users fingerprint after generating keyJames Booth2014-01-101-0/+4
| |
| * Use data home for otr keys and fingerprints filesJames Booth2014-01-101-24/+34
| |
| * WIP - OTR supportJames Booth2014-01-105-31/+109
| |
| * Merge branch 'master' into otrJames Booth2014-01-087-130/+76
| |\ | |/ |/|
* | Removed handle error message function from ProfWinJames Booth2014-01-086-120/+51
| |
* | Removed print message function from ProfWinJames Booth2014-01-083-12/+26
| |
* | Added clean.sh to gitignoreJames Booth2014-01-081-0/+1
| |
| * Merge branch 'master' into otrJames Booth2014-01-0517-627/+630
| |\ | |/ |/|
* | Refactored roster add/updateJames Booth2014-01-058-103/+101
| |
* | Removed prof_handle group functionsJames Booth2014-01-055-54/+14
| |
* | Removed roster_list dependency on xmpp moduleJames Booth2014-01-053-30/+22
| |
* | Refactored roster_change_nameJames Booth2014-01-053-13/+14
| |
* | Removed unused function prototypeJames Booth2014-01-051-1/+0
| |
SIZE(inst.ingredients) >= 1) { replace_offset(inst.ingredients.at(0), offset, i, r); } if ((inst.name == "loop-if" || inst.name == "loop-unless" || inst.name == "break-if" || inst.name == "break-unless") && SIZE(inst.ingredients) >= 2) { replace_offset(inst.ingredients.at(1), offset, i, r); } } } void replace_offset(reagent& x, /*const*/ map<string, int>& offset, const int current_offset, const recipe_ordinal r) { if (!is_literal(x)) { raise << maybe(get(Recipe, r).name) << "jump target must be offset or label but is '" << x.original_string << "'\n" << end(); x.set_value(0); // no jump by default return; } if (x.initialized) return; if (is_integer(x.name)) return; // non-labels will be handled like other number operands if (!is_jump_target(x.name)) { raise << maybe(get(Recipe, r).name) << "can't jump to label '" << x.name << "'\n" << end(); x.set_value(0); // no jump by default return; } if (!contains_key(offset, x.name)) { raise << maybe(get(Recipe, r).name) << "can't find label '" << x.name << "'\n" << end(); x.set_value(0); // no jump by default return; } x.set_value(get(offset, x.name) - current_offset); } void test_break_to_label() { run( "def main [\n" " {\n" " {\n" " break +target:label\n" " 1:num <- copy 0\n" " }\n" " }\n" " +target\n" "]\n" ); CHECK_TRACE_DOESNT_CONTAIN("mem: storing 0 in location 1"); } void test_jump_if_to_label() { run( "def main [\n" " {\n" " {\n" " jump-if 1, +target:label\n" " 1:num <- copy 0\n" " }\n" " }\n" " +target\n" "]\n" ); CHECK_TRACE_DOESNT_CONTAIN("mem: storing 0 in location 1"); } void test_loop_unless_to_label() { run( "def main [\n" " {\n" " {\n" " loop-unless 0, +target:label\n" // loop/break with a label don't care about braces " 1:num <- copy 0\n" " }\n" " }\n" " +target\n" "]\n" ); CHECK_TRACE_DOESNT_CONTAIN("mem: storing 0 in location 1"); } void test_jump_runs_code_after_label() { run( "def main [\n" // first a few lines of padding to exercise the offset computation " 1:num <- copy 0\n" " 2:num <- copy 0\n" " 3:num <- copy 0\n" " jump +target:label\n" " 4:num <- copy 0\n" " +target\n" " 5:num <- copy 0\n" "]\n" ); CHECK_TRACE_CONTENTS( "mem: storing 0 in location 5\n" ); CHECK_TRACE_DOESNT_CONTAIN("mem: storing 0 in location 4"); } void test_jump_fails_without_target() { Hide_errors = true; run( "def main [\n" " jump\n" "]\n" ); CHECK_TRACE_CONTENTS( "error: main: 'jump' expects an ingredient but got 0\n" ); } void test_jump_fails_without_target_2() { Hide_errors = true; run( "def main [\n" " jump-if true\n" "]\n" ); CHECK_TRACE_CONTENTS( "error: main: 'jump-if true' expects 2 ingredients but got 1\n" ); } void test_recipe_fails_on_duplicate_jump_target() { Hide_errors = true; run( "def main [\n" " +label\n" " 1:num <- copy 0\n" " +label\n" " 2:num <- copy 0\n" "]\n" ); CHECK_TRACE_CONTENTS( "error: main: duplicate label '+label'\n" ); } void test_jump_ignores_nontarget_label() { Hide_errors = true; run( "def main [\n" // first a few lines of padding to exercise the offset computation " 1:num <- copy 0\n" " 2:num <- copy 0\n" " 3:num <- copy 0\n" " jump $target:label\n" " 4:num <- copy 0\n" " $target\n" " 5:num <- copy 0\n" "]\n" ); CHECK_TRACE_CONTENTS( "error: main: can't jump to label '$target'\n" ); }