Skip to content

Remove cpp support #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbri wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Remove cpp support #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
093dc46
remove cpp generation (step 1)
rbri Oct 6, 2023
d4aa039
remove cpp generation (step 2)
rbri Oct 6, 2023
ff74078
remove cpp generation (step 3)
rbri Oct 6, 2023
e87ca0d
remove cpp generation (step 4)
rbri Oct 6, 2023
031bd19
remove cpp generation (step 5)
rbri Oct 6, 2023
a5437ab
make the output indention always based on blank, try to fix some alin…
rbri Oct 6, 2023
0295dcc
remove cpp generation (step 6)
rbri Oct 6, 2023
f47009f
remove cpp generation (step 7)
rbri Oct 6, 2023
082b54a
make the output indention always based on blank, try to fix some alin…
rbri Oct 6, 2023
5f8b27f
make the output indention always based on blank, try to fix some alin…
rbri Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,673 changes: 0 additions & 1,673 deletions examples/JavaGrammars/Java1.1-cpp.jj
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/com/helger/pgcc/jjdoc/BNFGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.util.HashMap;
import java.util.Map;

import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.NormalProduction;
import com.helger.pgcc.parser.TokenProduction;
Expand Down Expand Up @@ -108,9 +107,6 @@ public void tokensEnd ()
public void javacode (final CodeProductionJava jp)
{}

public void cppcode (final CodeProductionCpp cp)
{}

public void expansionEnd (final Expansion e, final boolean first)
{}

Expand Down
9 changes: 0 additions & 9 deletions src/main/java/com/helger/pgcc/jjdoc/HTMLGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import javax.annotation.Nonnull;

import com.helger.commons.string.StringHelper;
import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.NormalProduction;
import com.helger.pgcc.parser.TokenProduction;
Expand Down Expand Up @@ -192,14 +191,6 @@ public void javacode (final CodeProductionJava jp) throws IOException
productionEnd (jp);
}

@Override
public void cppcode (final CodeProductionCpp cp) throws IOException
{
productionStart (cp);
_println ("<I>cpp code</I></TD></TR>");
productionEnd (cp);
}

@Override
public void productionStart (final NormalProduction np) throws IOException
{
Expand Down
23 changes: 6 additions & 17 deletions src/main/java/com/helger/pgcc/jjdoc/IDocGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.io.Serializable;

import com.helger.commons.ValueEnforcer;
import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.NormalProduction;
import com.helger.pgcc.parser.TokenProduction;
Expand Down Expand Up @@ -75,15 +74,15 @@ public interface IDocGenerator extends Serializable

/**
* Output document header.
*
*
* @throws IOException
* on IO error
*/
void documentStart () throws IOException;

/**
* Output document footer.
*
*
* @throws IOException
* on IO error
*/
Expand Down Expand Up @@ -115,31 +114,31 @@ public interface IDocGenerator extends Serializable

/**
* Output start of non-terminal.
*
*
* @throws IOException
* on IO error
*/
void nonterminalsStart () throws IOException;

/**
* Output end of non-terminal.
*
*
* @throws IOException
* on IO error
*/
void nonterminalsEnd () throws IOException;

/**
* Output start of tokens.
*
*
* @throws IOException
* on IO error
*/
void tokensStart () throws IOException;

/**
* Output end of tokens.
*
*
* @throws IOException
* on IO error
*/
Expand All @@ -155,16 +154,6 @@ public interface IDocGenerator extends Serializable
*/
void javacode (CodeProductionJava jp) throws IOException;

/**
* Output comment from a production.
*
* @param cp
* the CppCodeProduction to output
* @throws IOException
* on IO error
*/
void cppcode (CodeProductionCpp cp) throws IOException;

/**
* Output start of a normal production.
*
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/com/helger/pgcc/jjdoc/JJDoc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import com.helger.commons.string.StringHelper;
import com.helger.pgcc.PGPrinter;
import com.helger.pgcc.parser.BNFProduction;
import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.JavaCCGlobals;
import com.helger.pgcc.parser.NormalProduction;
Expand Down Expand Up @@ -203,15 +202,10 @@ private static void _emitNormalProductions (final IDocGenerator gen, final List
gen.productionEnd (np);
}
else
if (np instanceof CodeProductionCpp)
if (np instanceof CodeProductionJava)
{
gen.cppcode ((CodeProductionCpp) np);
gen.javacode ((CodeProductionJava) np);
}
else
if (np instanceof CodeProductionJava)
{
gen.javacode ((CodeProductionJava) np);
}
}
gen.nonterminalsEnd ();
}
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/helger/pgcc/jjdoc/TextGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import com.helger.commons.io.file.FileHelper;
import com.helger.commons.string.StringHelper;
import com.helger.pgcc.PGPrinter;
import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.NormalProduction;
import com.helger.pgcc.parser.Options;
Expand Down Expand Up @@ -118,13 +117,6 @@ public void javacode (final CodeProductionJava jp) throws IOException
productionEnd (jp);
}

public void cppcode (final CodeProductionCpp cp) throws IOException
{
productionStart (cp);
text ("c++ code");
productionEnd (cp);
}

public void productionStart (final NormalProduction np) throws IOException
{
m_aPW.write ("\t" + np.getLhs () + "\t:=\t");
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/helger/pgcc/jjdoc/XTextGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.io.IOException;
import java.io.Writer;

import com.helger.pgcc.parser.CodeProductionCpp;
import com.helger.pgcc.parser.CodeProductionJava;
import com.helger.pgcc.parser.NormalProduction;
import com.helger.pgcc.parser.RegExprSpec;
Expand Down Expand Up @@ -125,9 +124,6 @@ public void tokensEnd ()
public void javacode (final CodeProductionJava jp)
{}

public void cppcode (final CodeProductionCpp cp)
{}

public void productionStart (final NormalProduction np)
{}

Expand Down
20 changes: 1 addition & 19 deletions src/main/java/com/helger/pgcc/jjtree/ASTGrammar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@

package com.helger.pgcc.jjtree;

import com.helger.pgcc.PGPrinter;
import com.helger.pgcc.jjtree.output.NodeFilesCpp;
import com.helger.pgcc.output.UnsupportedOutputLanguageException;
import com.helger.pgcc.parser.Options;

public class ASTGrammar extends JJTreeNode
{
ASTGrammar (final int nID)
Expand All @@ -78,22 +73,9 @@ public class ASTGrammar extends JJTreeNode

void generate (final JJTreeIO io)
{
PGPrinter.info ("opt:" + Options.getOutputLanguage ().getID ());
// TODO :: CBA -- Require Unification of output language specific processing
// into a single Enum class
switch (Options.getOutputLanguage ())
{
case JAVA:
new CodeGeneratorJava ().visit (this, io);
break;
case CPP:
new CodeGeneratorCpp ().visit (this, io);
NodeFilesCpp.generateTreeClasses ();
break;
default:
// Catch all to ensure we don't accidently do nothing
throw new UnsupportedOutputLanguageException (Options.getOutputLanguage ());
}
new CodeGeneratorJava ().visit (this, io);
}

/** Accept the visitor. **/
Expand Down
Loading