Skip to content

Commit

Permalink
Rename vclang to Arend
Browse files Browse the repository at this point in the history
  • Loading branch information
valis committed Sep 21, 2018
1 parent d337f6f commit a85a0c0
Show file tree
Hide file tree
Showing 260 changed files with 3,640 additions and 3,660 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -24,8 +24,8 @@ hs_err_pid*
# Gradle wrapper
!gradle/wrapper/gradle-wrapper.jar

# Vclang
!lib/vclang-*.jar
# Arend
!lib/arend-*.jar

# Intellij
*.iml
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -11,9 +11,9 @@ branches:
- travis

install:
- git clone https://github.com/JetBrains/vclang.git ../vclang
- git clone https://github.com/JetBrains/arend.git ../arend

script: ./gradlew check -x :vclang:check -Pkotlin.incremental=false -Dkotlin.daemon.jvm.options=-Xmx1024m
script: ./gradlew check -x :arend:check -Pkotlin.incremental=false -Dkotlin.daemon.jvm.options=-Xmx1024m

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
8 changes: 4 additions & 4 deletions LICENSE
Expand Up @@ -12,15 +12,15 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

Copyright for portions of project Vclang plugin for the IntelliJ IDEA are
held by Valery Isaev, 2015 as part of project Vclang.
Copyright for portions of project Arend plugin for the IntelliJ IDEA are
held by Valery Isaev, 2015 as part of project Arend.

Copyright for additional portions of project Vclang plugin for the IntelliJ
Copyright for additional portions of project Arend plugin for the IntelliJ
IDEA are held by Aleksey Kladov, Evgeny Kurbatsky, Alexey Kudinkin and
contributors, 2015 as part of project Rust plugin for the IntelliJ Platform
and are provided under the MIT license.

All other copyright for project Vclang plugin for the IntelliJ IDEA are
All other copyright for project Arend plugin for the IntelliJ IDEA are
held by Mikhail Chernyavsky, Valery Isaev, Sergey Sinchuk and Fedor Part, 2017.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
Expand Down
14 changes: 7 additions & 7 deletions README.md
@@ -1,17 +1,17 @@
# Vclang plugin for IntelliJ IDEA
# Arend plugin for IntelliJ IDEA

[![JetBrains incubator project](http://jb.gg/badges/incubator.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![Build Status][travis-build-status-svg]][travis-build-status]

Plugin that implements [Vclang](https://github.com/JetBrains/vclang) support
Plugin that implements [Arend](https://github.com/JetBrains/Arend) support
in [IntelliJ IDEA](http://www.jetbrains.com/idea/) and other IntelliJ-based products.

## Clone

```
git clone https://github.com/JetBrains/vclang
git clone https://github.com/JetBrains/intellij-vclang.git
cd intellij-vclang
git clone https://github.com/JetBrains/Arend
git clone https://github.com/JetBrains/intellij-arend.git
cd intellij-arend
```

## Building
Expand Down Expand Up @@ -50,5 +50,5 @@ A Program Structure Interface (PSI) tree viewer.
The project is configured to build and run tests with Travis CI, which you can enable in your forks.

<!-- Badges -->
[travis-build-status]: https://travis-ci.org/JetBrains/intellij-vclang?branch=dev
[travis-build-status-svg]: https://travis-ci.org/JetBrains/intellij-vclang.svg?branch=dev
[travis-build-status]: https://travis-ci.org/JetBrains/intellij-arend?branch=dev
[travis-build-status-svg]: https://travis-ci.org/JetBrains/intellij-arend.svg?branch=dev
28 changes: 14 additions & 14 deletions build.gradle.kts
Expand Up @@ -19,7 +19,7 @@ repositories {
}

dependencies {
compile(project(":vclang"))
compile(project(":Arend"))
compileOnly(kotlin("stdlib-jdk8"))
}

Expand All @@ -34,7 +34,7 @@ tasks.withType<KotlinCompile> {
languageVersion = "1.2"
apiVersion = "1.2"
}
dependsOn("generateVcLexer", "generateVcParser")
dependsOn("generateArendLexer", "generateArendParser")
}

java.sourceSets {
Expand All @@ -51,28 +51,28 @@ idea {

intellij {
version = "2018.2"
pluginName = "intellij-vclang"
pluginName = "Arend"
updateSinceUntilBuild = true
instrumentCode = false
setPlugins("yaml")
}

task<GenerateLexer>("generateVcLexer") {
task<GenerateLexer>("generateArendLexer") {
description = "Generates lexer"
group = "Source"
source = "src/main/grammars/VcLexer.flex"
targetDir = "src/gen/org/vclang/lexer"
targetClass = "VcLexer"
source = "src/main/grammars/ArendLexer.flex"
targetDir = "src/gen/org/arend/lexer"
targetClass = "ArendLexer"
purgeOldFiles = true
}

task<GenerateParser>("generateVcParser") {
task<GenerateParser>("generateArendParser") {
description = "Generates parser"
group = "Source"
source = "src/main/grammars/VcParser.bnf"
source = "src/main/grammars/ArendParser.bnf"
targetRoot = "src/gen"
pathToParser = "/org/vclang/parser/VcParser.java"
pathToPsiRoot = "/org/vclang/psi"
pathToParser = "/org/arend/parser/ArendParser.java"
pathToPsiRoot = "/org/arend/psi"
purgeOldFiles = true
}

Expand All @@ -94,10 +94,10 @@ afterEvaluate {
}

task<Copy>("prelude") {
from(project(":vclang").file("lib/Prelude.vc"))
from(project(":vclang").file("${project(":vclang").buildDir}/classes/main/lib/Prelude.vcc"))
from(project(":Arend").file("lib/Prelude.ard"))
from(project(":Arend").file("${project(":Arend").buildDir}/classes/main/lib/Prelude.arc"))
into("src/main/resources/lib")
dependsOn(project(":vclang").relativeProjectPath(":prelude"))
dependsOn(project(":Arend").relativeProjectPath(":prelude"))
}

tasks.withType<Wrapper> {
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
@@ -1,3 +1,3 @@
rootProject.name = "intellij-vclang"
rootProject.name = "intellij-arend"

includeFlat("vclang")
includeFlat("Arend")
@@ -1,22 +1,22 @@
package org.vclang.lexer;
package org.arend.lexer;

import com.intellij.lexer.FlexLexer;
import com.intellij.psi.tree.IElementType;

import static com.intellij.psi.TokenType.BAD_CHARACTER;
import static com.intellij.psi.TokenType.WHITE_SPACE;
import static org.vclang.psi.VcElementTypes.*;
import static org.arend.psi.ArendElementTypes.*;

%%

%{
public VcLexer() {
public ArendLexer() {
this((java.io.Reader)null);
}
%}

%public
%class VcLexer
%class ArendLexer
%implements FlexLexer
%function advance
%type IElementType
Expand Down

0 comments on commit a85a0c0

Please sign in to comment.