hip: hip.js comparison

comparison hip.js @ 7:aab0d14248f5

All suggested completions now return sensible descriptions of what they would do if executed.

author	jonathandicarlo@jonathan-dicarlos-macbook-pro.local
date	Wed, 14 May 2008 14:59:24 -0700
parents	98935af12b04
children	11a051a31077

comparison

equal deleted inserted replaced

-:98935af12b04
+:aab0d14248f5
 // keys are prepositions
 // values are NounTypes.
 // example:  { "from" : City, "to" : City, "on" : Day }
 },
-getDescription: function() {
+getDescription: function( directObject, prepositionPhrases ) {
 // returns a string describing what the sentence will do if executed
-return this._verb.getDescription( this._DO, this._modifiers );
+var desc = "Hit enter to do " + this._name + " with direct object " + directObject;
-}
+for ( var x in prepositionPhrases ) {
+desc = desc + ", " + x + " " + prepositionPhrases[x];
+}
+return desc;
+},
 recursiveParse: function( unusedWords, filledMods, unfilledMods ) {
 var x;
 var suggestions = [];
 var completions = [];
 	}
 }
 if ( matchIndices.length == 0 ) {
 	// no match for this preposition.
 	// Leave it blank and try to parse the rest:
-	filledMods[preposition] = "";
+	var newFilledMods = dictDeepCopy( filledMods );
+	newFilledMods[preposition] = "";
 	var directObject = unusedWords.join( " " );
-	return [ new ParsedSentence( this, directObject, filledMods ) ];
+	return this.recursiveParse( unusedWords, newFilledMods, newUnfilledMods );
-	//return this.recursiveParse( unusedWords, filledMods, newUnfilledMods );
 } else {
 	// this is placeholder, destroy it.
 	for ( x in matchIndices ) {
 	  var noun = unusedWords[ matchIndices[x]+1 ];
 	  var newUnusedWords = unusedWords.slice();
 }
 }
 };
 var fly = new Verb( "fly", null, null, { "from": city, "to": city } );
+fly.getDescription = function( directObject, mods ) {
+var fromCity = mods[ "from" ];
+var toCity = mods["to"];
+if ( !fromCity ) {
+fromCity = "from somewhere";
+}
+if ( !toCity ) {
+toCity = "to somewhere else";
+}
+return "Buy airplane tickets from " + fromCity + " to " + toCity;
+};
 var define = new Verb( "define", "word", anyWord, {} );
+define.getDescription = function( directObject, mods ) {
+if (directObject ) {
+return "Search for definition of the word &quot;" + directObject + "&quot;";
+} else {
+return "Search for the definition of a word.";
+}
+};
 var google = new Verb( "google", "word", anyWord, {} );
+google.getDescription = function( directObject, mods ) {
+if (directObject ) {
+return "Search Google for &quot;" + directObject + "&quot;";
+} else {
+return "Search Google for a word or phrase.";
+}
+};
 var go = new Verb( "go", "tab", tab, {} );
+go.getDescription = function( directObject, mods ) {
+if (directObject ) {
+return "Switch to the Firefox tab &quot;" + directObject + "&quot;";
+} else {
+return "Search to a given Firefox tab.";
+}
+};
 var close = new Verb( "close", null, null, {} );
+close.getDescription = function( directObject, mods ) {
+return "Close the front window or tab.";
+};
 var translate = new Verb( "translate", "text", anyWord, { "from": language, "to": language } );
+translate.getDescription = function( directObject, mods ) {
+if (directObject ) {
+var DO = "the phrase &quot;" + directObject + "&quot;";
+} else {
+var DO = "a given phrase";
+}
+var fromLang = mods["from"];
+if (!fromLang) {
+fromLang = "a given language";
+}
+var toLang = mods["to"];
+if (!fromLang) {
+toLang = "another language.";
+}
+return "Translate " + DO + " from " + fromLang + " to " + toLang;
+};
 var nuke = new Verb( "nuke", "city", city, {} );
+nuke.getDescription = function( directObject, mods ) {
+if (!directObject) {
+directObject = "a given city";
+}
+return "Launch a nuclear missile at " + directObject;
+};
 var open = new Verb( "open", "url", anyWord, {} );
+open.getDescription = function( directObject, mods ) {
+if (directObject ) {
+return "Open the URL &quot;" + directObject + "&quot;";
+} else {
+return "Open a given URL.";
+}
+};
 var email = new Verb( "email", "text", anyWord, { "to": person, "subject": anyWord } );
+email.getDescription = function( directObject, mods ) {
+if (directObject ) {
+var DO = "the message &quot;" + directObject + "&quot; as an email";
+} else {
+var DO = "an email";
+}
+var target = mods["to"];
+if ( !target ) {
+target = "someone from your address book";
+}
+if ( mods["subject"] ) {
+var subject = ", with the subject " + mods["subject"] + ", ";
+} else {
+var subject = " ";
+}
+return "Send " + DO + subject + "to " + target;
+};
 var encrypt = new Verb( "encrypt", "text", anyWord, { "for": person } );
+encrypt.getDescription = function( directObject, mods ) {
+if (directObject ) {
+var DO = "the message &quot;" + directObject + "&quot;";
+} else {
+var DO = "a secret message";
+}
+var target = mods["for"];
+if ( !target ) {
+target = "one particular person";
+}
+return "Encrypt " + DO + " so it can only be read by " + target;
+};
 var wiki = new Verb( "wikipedia", "word", anyWord, { "language": language } );
+wiki.getDescription = function( directObject, mods ) {
+var desc = "Search ";
+if ( mods["language"] ) {
+desc = desc + "the " + mods["language"] + " language version of ";
+}
+desc = desc + "Wikipedia for &quot;" + directObject + "&quot;";
+return desc;
+};
 var verbs = [ fly, define, google, go, close, open, translate, email, nuke, encrypt, wiki ];
 /* Initial state: no verb determined.
 After each keypress, update verb suggestion list.
 getSuggestionsAsHtml : function() {
 return [ this._suggestionList[x].getDisplayText() for ( x in this._suggestionList ) ];
 },
+getDescriptionText: function() {
+if ( this._suggestionList.length == 0 ) {
+return "Type some commands!";
+}
+var h = this._hilitedSuggestion;
+if ( h == 0 ) {
+h = 0;
+} else {
+h = h - 1;
+}
+var sentence = this._suggestionList[h];
+return sentence.getDescription();
+},
 indicationDown: function( ) {
 this._hilitedSuggestion ++;
 if ( this._hilitedSuggestion > this._suggestionList.length ) {
 this._hilitedSuggestion = 0;
 }
 }
 function updateDisplay( ) {
 var suggestions = gQs.getSuggestionsAsHtml();
 var hilitedSuggestion = gQs.getHilitedSuggestion();
+var description = gQs.getDescriptionText();
+$("#status-line").html( description );
 var ac = $("#autocomplete-popup");
 ac.html( makeSuggestionHtml( "div", suggestions, hilitedSuggestion ) );
 ac.show();
 }
 function searchBoxQuery( event ) {
 // TODO: if the event is an 'esc' key, clear the input field.
 // If the event is an 'up arrow' or 'down arrow' key, change the
 );
 });
 /* Minor problems:
 2. multiple word direct objects are truncated to single word
-3. prepositional phrases past the first don't get matched?
+5. Need to include the suggestion where matched prepositions aren't used but
-4. sentences need to have descriptions
+are treated as part of the direct object instead.
 */