Merge pull request #17 from fakelag/lang-srv

Add language server for vscode extension
fakelag · May 21, 2020 · 43ea76b · 43ea76b
2 parents 1def0a5 + ce92f6a
commit 43ea76b
Show file tree

Hide file tree

Showing 13 changed files with 427 additions and 76 deletions.
diff --git a/CLI/CLI.cpp b/CLI/CLI.cpp
@@ -98,7 +98,9 @@ int main( int argc, char* argv[] )
 
 		for ( auto token : tokens )
 		{
-			std::cout << "\"" + token.m_String + "\" lbp=" + std::to_string( token.m_LBP ) << std::endl;
+			std::cout << "\""
+				+ token.m_String + "\" line=" + std::to_string( token.m_LineNr )
+				+ " column=" + std::to_string( token.m_ColNr ) << std::endl;
 		}
 	}
 	else if ( GetArg( "--typer", argc, argv, &next ) )
@@ -146,8 +148,9 @@ int main( int argc, char* argv[] )
 
 				if ( source.length() == 0 )
 				{
-					std::cout << "Json >";
-					std::getline( std::cin, source );
+					std::string newLine;
+					while ( std::getline( std::cin, newLine ) )
+						source += newLine + "\n";
 				}
 
 				auto astNodes = QScript::GenerateAST( source );
@@ -165,17 +168,20 @@ int main( int argc, char* argv[] )
 			}
 			EXCEPTION_HANDLING;
 
-			if ( input.length() > 0 )
+			if ( input.length() > 0 || GetArg( "--exit", argc, argv, &next ) )
 				break;
 		}
 	}
-	else if ( input.length() > 0 )
+	else
 	{
+		if ( input.length() == 0 )
+			std::cin >> input;
+
 		QScript::FunctionObject* function = NULL;
 
 		try
 		{
-			function = QScript::Compile( ReadFile( next ) );
+			function = QScript::Compile( input );
 			QScript::Interpret( *function );
 		}
 		EXCEPTION_HANDLING;

diff --git a/Includes/Exception.h b/Includes/Exception.h
@@ -39,6 +39,11 @@ class CompilerException : public Exception
 			+ " (\"" + m_Token + "\")" );
 	}
 
+	int						LineNr()		{ return m_LineNr; }
+	int						ColNr()			{ return m_ColNr; }
+	const std::string&		Token()			{ return m_Token; }
+	const std::string&		What()			{ return m_What; }
+
 protected:
 	int 			m_LineNr;
 	int 			m_ColNr;

diff --git a/LangSrv/LangSrv.cpp b/LangSrv/LangSrv.cpp
@@ -0,0 +1,73 @@
+#include "QLibPCH.h"
+
+bool GetArg( const std::string& argument, int argc, char* argv[], std::string* next )
+{
+	for ( int i = 1; i < argc; ++i )
+	{
+		if ( argv[ i ] == argument )
+		{
+			if ( i + 1 < argc )
+				*next = argv[ i + 1 ];
+			else
+				*next = "";
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+int main( int argc, char* argv[] )
+{
+#ifdef QS_MEMLEAK_TEST
+	_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#endif
+
+	std::string next;
+
+	for ( ;;)
+	{
+		try
+		{
+			std::string source;
+			std::string newLine;
+
+			while ( std::getline( std::cin, newLine ) )
+				source += newLine + "\n";
+
+			auto mainFunction = QScript::Compile( source );
+			std::cout << "OK" << std::endl;
+
+			QScript::FreeFunction( mainFunction );
+		}
+		catch ( std::vector< CompilerException >& exceptions )
+		{
+			for ( auto ex : exceptions )
+			{
+				std::cout << "[" + ex.id() + ","
+					+ std::to_string( ex.LineNr() ) + ","
+					+ std::to_string( ex.ColNr() ) + ","
+					+ std::to_string( ex.Token().length() ) + "]:" + ( ex.What() + std::string( " on line " )
+						+ std::to_string( ex.LineNr() ) + " character " + std::to_string( ex.ColNr() )
+						+ " (\"" + ex.Token() + "\")" ) << std::endl;
+			}
+		}
+		catch ( const Exception& exception )
+		{
+			std::cout << "[" + exception.id() + "]:" + exception.describe() << std::endl;
+		}
+		catch ( const std::exception& exception )
+		{
+			std::cout << std::string( "[std_generic]:" ) + exception.what() << std::endl;
+		}
+		catch ( ... )
+		{
+			std::cout << "[unknown]" << std::endl;
+		}
+
+		if ( GetArg( "--exit", argc, argv, &next ) )
+			break;
+	}
+	return 0;
+}
diff --git a/LangSrv/LangSrv.vcxproj b/LangSrv/LangSrv.vcxproj
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{330A0596-DB49-45E4-AD2C-43A15AA29D21}</ProjectGuid>
+    <RootNamespace>LangSrv</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Includes;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)$(Configuration)\QScript.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Includes;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(SolutionDir)$(Configuration)\$(Platform)\QScript.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Includes;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)$(Configuration)\QScript.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(SolutionDir)Includes;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)$(Configuration)\$(Platform)\QScript.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="LangSrv.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/LangSrv/LangSrv.vcxproj.filters b/LangSrv/LangSrv.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="LangSrv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>