1311

pending completion

Build # 1311

Build Type

Pull #342

travis-ci-com

Committed by

web-flow

Commit Message

Merge 31afe3c05 into 6391b9c2f

Pull Request Pull Request #342: Yet another round of fixes

Run Details

6908 of 12991 branches covered (53.18%)

Branch coverage included in aggregate %.

123 of 142 new or added lines in 12 files covered. (86.62%)

16 existing lines in 4 files now uncovered.

15591 of 24838 relevant lines covered (62.77%)

1583628.95 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

53.49

/languages/thingtalk/dialogue_acts/coref-actions.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
"use strict";

const assert = require('assert');

const ThingTalk = require('thingtalk');
const Ast = ThingTalk.Ast;

const C = require('../ast_manip');

function contextualAction(ctx, action) {
    assert(action instanceof Ast.Invocation);
    const ctxInvocation = C.getInvocation(ctx.next);
    if (!ctxInvocation || ctxInvocation.selector.isBuiltin)
        return null;
    if (!C.isSameFunction(ctxInvocation.schema, action.schema))
        return null;
    if (action.in_params.length === 0) // common case, no new parameters
        return ctxInvocation;

    for (let newParam of action.in_params) {
        if (newParam.value.isUndefined)
            continue;

        // check that we don't change a previous parameter

        // if we're introducing a value for the chain parameter that was not previously provided,
        // it must one of the top 3 results
        if (newParam.name === ctx.nextInfo.chainParameter &&
           !ctx.nextInfo.chainParameterFilled) {
            if (!ctx.results)
                return null;
            const results = ctx.results;
            let good = false;
            for (let i = 0; i < Math.min(results.length, 3); i ++) {
                const id = results[i].value.id;
                if (id && id.equals(newParam.value)) {
                    good = true;
                    break;
                }
            }
            if (!good)
                return null;
        }

        for (let oldParam of ctxInvocation.in_params) {
            if (oldParam.value.isUndefined)
                continue;
            if (newParam.name !== oldParam.name)
                continue;

            if (!newParam.value.equals(oldParam.value))
                return null;
        }
    }

    // semi-shallow clone
    const clone = new Ast.Invocation(null, ctxInvocation.selector, ctxInvocation.channel,
        ctxInvocation.in_params.map((ip) => new Ast.InputParam(null, ip.name, ip.value)),
        ctxInvocation.schema);
    for (let newParam of action.in_params) {
        if (newParam.value.isUndefined)
            continue;

        let found = false;
        for (let oldParam of clone.in_params) {
            if (newParam.name === oldParam.name) {
                if (oldParam.value.isUndefined)
                    oldParam.value = newParam.value;
                found = true;
                break;
            }
        }

        if (!found)
            clone.in_params.push(newParam);
    }

    return clone;
}

module.exports = {
    contextualAction
};

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Licensed under the Apache License, Version 2.0 (the "License");
8	// you may not use this file except in compliance with the License.
9	// You may obtain a copy of the License at
10	//
11	// http://www.apache.org/licenses/LICENSE-2.0
12	//
13	// Unless required by applicable law or agreed to in writing, software
14	// distributed under the License is distributed on an "AS IS" BASIS,
15	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	// See the License for the specific language governing permissions and
17	// limitations under the License.
18	//
19	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
20	"use strict";
21
22	const assert = require('assert');	3✔
23
24	const ThingTalk = require('thingtalk');	3✔
25	const Ast = ThingTalk.Ast;	3✔
26
27	const C = require('../ast_manip');	3✔
28
29	function contextualAction(ctx, action) {
30	assert(action instanceof Ast.Invocation);	19,115✔
31	const ctxInvocation = C.getInvocation(ctx.next);	19,115✔
32	if (!ctxInvocation \|\| ctxInvocation.selector.isBuiltin)	19,115!
33	return null;	×
34	if (!C.isSameFunction(ctxInvocation.schema, action.schema))	19,115✔
35	return null;	17,137✔
36	if (action.in_params.length === 0) // common case, no new parameters	1,978!
37	return ctxInvocation;	×
38
39	for (let newParam of action.in_params) {	1,978✔
40	if (newParam.value.isUndefined)	7,746✔
41	continue;	7,703✔
42
43	// check that we don't change a previous parameter
44
45	// if we're introducing a value for the chain parameter that was not previously provided,
46	// it must one of the top 3 results
47	if (newParam.name === ctx.nextInfo.chainParameter &&	43!
48	!ctx.nextInfo.chainParameterFilled) {
49	if (!ctx.results)	43!
50	return null;	×
51	const results = ctx.results;	43✔
52	let good = false;	43✔
53	for (let i = 0; i < Math.min(results.length, 3); i ++) {	43✔
54	const id = results[i].value.id;	129✔
55	if (id && id.equals(newParam.value)) {	129!
56	good = true;	×
57	break;	×
58	}
59	}
60	if (!good)	43!
61	return null;	43✔
62	}
63
UNCOV 64	for (let oldParam of ctxInvocation.in_params) {	×
UNCOV 65	if (oldParam.value.isUndefined)	×
UNCOV 66	continue;	×
67	if (newParam.name !== oldParam.name)	×
68	continue;	×
69
70	if (!newParam.value.equals(oldParam.value))	×
71	return null;	×
72	}
73	}
74
75	// semi-shallow clone
76	const clone = new Ast.Invocation(null, ctxInvocation.selector, ctxInvocation.channel,	1,935✔
77	ctxInvocation.in_params.map((ip) => new Ast.InputParam(null, ip.name, ip.value)),	7,703✔
78	ctxInvocation.schema);
79	for (let newParam of action.in_params) {	1,935✔
80	if (newParam.value.isUndefined)	7,703!
81	continue;	7,703✔
82
UNCOV 83	let found = false;	×
UNCOV 84	for (let oldParam of clone.in_params) {	×
UNCOV 85	if (newParam.name === oldParam.name) {	×
UNCOV 86	if (oldParam.value.isUndefined)	×
UNCOV 87	oldParam.value = newParam.value;	×
UNCOV 88	found = true;	×
UNCOV 89	break;	×
90	}
91	}
92
UNCOV 93	if (!found)	×
94	clone.in_params.push(newParam);	×
95	}
96
97	return clone;	1,935✔
98	}
99
100	module.exports = {	3✔
101	contextualAction
102	};

stanford-oval / genie-toolkit / 1311

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous