Skip to content

Commit feaf5fd

Browse files
committed
Do not include VSCode config info
1 parent 79d5f20 commit feaf5fd

File tree

12 files changed

+22
-27
lines changed

12 files changed

+22
-27
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,10 @@ local.properties
2222

2323
# Maven
2424
target
25+
26+
# VSCode
27+
.vscode
28+
29+
# PHP Config file, should not be in GitHub
30+
src/main/rascal/lang/php/config/Config.rsc
31+

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<directory>src/main/rascal</directory>
7171
<filtering>false</filtering>
7272
<excludes>
73-
<exclude>lang/php/util/Config.rsc</exclude>
74-
<exclude>lang/php/util/Config.rsc-dist</exclude>
73+
<exclude>lang/php/config/Config.rsc</exclude>
74+
<exclude>lang/php/config/Config.rsc-dist</exclude>
7575
</excludes>
7676
</resource>
7777
</resources>
@@ -157,7 +157,7 @@
157157
<src>${project.basedir}/src/main/rascal</src>
158158
</srcs>
159159
<srcIgnores>
160-
<ignore>${project.basedir}/src/main/rascal/lang/php/util/Config.rsc</ignore>
160+
<ignore>${project.basedir}/src/main/rascal/lang/php/config/Config.rsc</ignore>
161161
</srcIgnores>
162162
</configuration>
163163
<executions>

src/main/rascal/lang/php/analysis/includes/IncludesInfo.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module lang::php::analysis::includes::IncludesInfo
1414

1515
import lang::php::ast::AbstractSyntax;
1616
import lang::php::ast::System;
17-
import lang::php::util::Config;
17+
import lang::php::config::Config;
1818
import lang::php::analysis::evaluators::AlgebraicSimplification;
1919
import lang::php::analysis::evaluators::SimulateCalls;
2020
import lang::php::analysis::evaluators::MagicConstants;

src/main/rascal/lang/php/analysis/signatures/Summaries.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1414
module lang::php::analysis::signatures::Summaries
1515

1616
import ValueIO;
17-
import lang::php::util::Config;
17+
import lang::php::config::Config;
1818

1919
private loc summariesDir = baseLoc + "serialized/summaries";
2020

src/main/rascal/lang/php/util/Config.rsc renamed to src/main/rascal/lang/php/config/Config.rsc-dist

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
@license{
2-
Copyright (c) 2013, NWO-I Centrum Wiskunde & Informatica (CWI), Mark Hills, Apalachean State University
3-
All rights reserved.
4-
5-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
6-
7-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
8-
9-
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
10-
11-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12-
}
13-
module lang::php::util::Config
1+
module lang::php::config::Config
142

153
@doc{Indicates whether to use the parser contained in a distributed jar file or from the directory given below}
164
public bool usePhpParserJar = false;

src/main/rascal/lang/php/stats/SLOC.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1212
}
1313
module lang::php::stats::SLOC
1414

15-
import lang::php::util::Config;
15+
import lang::php::config::Config;
1616
import lang::php::util::Corpus;
1717

1818
import IO;

src/main/rascal/lang/php/stats/Stats.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import lang::php::util::Utils;
1717
import lang::php::ast::AbstractSyntax;
1818
import lang::php::util::Corpus;
1919
import lang::php::ast::System;
20-
import lang::php::util::Config;
20+
import lang::php::config::Config;
2121

2222
import Set;
2323
import String;

src/main/rascal/lang/php/stats/Unfriendly.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import lang::php::stats::Stats;
2929
import lang::php::ast::System;
3030
import lang::php::util::Corpus;
3131
import lang::php::ast::AbstractSyntax;
32-
import lang::php::util::Config;
32+
import lang::php::config::Config;
3333
import lang::php::analysis::signatures::Summaries;
3434
import lang::php::analysis::includes::IncludeGraph;
3535
import lang::php::analysis::NamePaths;

src/main/rascal/lang/php/util/Corpus.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1414
module lang::php::util::Corpus
1515

1616
import lang::php::stats::Stats;
17-
import lang::php::util::Config;
17+
import lang::php::config::Config;
1818

1919
import String;
2020
import IO;

src/main/rascal/lang/php/util/Utils.rsc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module lang::php::util::Utils
1616
import lang::php::util::Corpus;
1717
import lang::php::ast::System;
1818
import lang::php::ast::AbstractSyntax;
19-
import lang::php::util::Config;
19+
import lang::php::config::Config;
2020

2121
import IO;
2222
import ValueIO;
@@ -54,8 +54,8 @@ public str executePHP(list[str] opts, loc cwd) {
5454
}
5555

5656
private Script parsePHPfile(loc f, list[str] opts, Script error) {
57-
//loc parserLoc = usePhpParserJar ? getPhpParserLocFromJar() : lang::php::util::Config::parserLoc;
58-
loc parserLoc = lang::php::util::Config::parserLoc;
57+
//loc parserLoc = usePhpParserJar ? getPhpParserLocFromJar() : lang::php::config::Config::parserLoc;
58+
loc parserLoc = lang::php::config::Config::parserLoc;
5959
str phpOut = "";
6060
try {
6161
str filePath = f.path;

0 commit comments

Comments
 (0)